configuration for heroku
Merge branch 'feature/login' into develop