Fix rotation bugs
Merge branch 'master' of https://github.com/mnipper/AndroidSurvey