Halfway conversion to multiple surveys architecture, refactoring and renaming ImageChoiceActivity => SurveyActivity
Merge branch 'master' of https://github.com/erhardt/Action-Path-Test