Merge branch 'hotfix/production_to_pg'

* hotfix/production_to_pg:
  edit database.yml
staging added
Merge branch 'hotfix/add_staging' into develop

* hotfix/add_staging:
  staging added