Merge branch 'hotfix/pg_on_production'
Fixed assest on heroku.
Merge branch 'hotfix/heroku_assets' into develop