fix survey creation
Merge branch 'master' into createSurvey
Merge branch 'master' into createSurvey