Settings for heroku deploy
Merge branch 'dev' into feature/visual