added a survey done button
Merge branch 'master' into survey_button