Merge branch 'hotfix/failed_form_path' into develop
just to make it run on heroku
Merge branch 'develop'