Merge branch 'hotfix/rollback_devise'
Added a bunch of tries... ;)
Merge branch 'hotfix/survey_errors' into develop