added pg for heroku
Merge branch 'hotfix/1.0b' into develop
Please release to heroku
Merge branch 'release/2.0'