Merge branch 'develop'
[N/A] Using postgresql as database. Heroku fails to initiate a sqlite database.

Reviewed by N/A
Merge branch 'hot-fix/database-migration' into develop