refactor getNextQuestion
Merge branch 'develop' of https://github.com/mnipper/AndroidSurvey into develop