Changed password
Merge branch 'develop' into heroku

Conflicts:
	src/main/resources/heroku/heroku.yml
Merge branch 'develop' into heroku
...
...
Finally fixed?