Merge branch 'release/initial_release'
Merge branch 'hotfix/heroku_pg' into develop