Merge branch 'release-v1.1' into develop
Merge branch 'develop' of https://github.com/mnipper/AndroidSurvey into develop