db is now on postgres
Merge branch 'hotfix/db_pg'

* hotfix/db_pg:
  db is now on postgres