use layout for picture
Merge branch 'release-v1.2' of https://github.com/mnipper/AndroidSurvey into release-v1.2