edit database.yml
Merge branch 'hotfix/production_to_pg'

* hotfix/production_to_pg:
  edit database.yml