Fix bug where someone could type for a previous or next question when navigating through survey
Merge branch 'release-v1.1' of https://github.com/mnipper/AndroidSurvey into release-v1.1
Fix develop merge conflict