Merge branch 'hotfix/admin_buttons'

* hotfix/admin_buttons:
  fix admin buttons on the rojec
  good admins welcome page
edit database.yml
Merge branch 'hotfix/production_to_pg' into develop

* hotfix/production_to_pg:
  edit database.yml