user can take a survey
Merge branch 'master' into take_a_survey