mail settings
Merge branch 'hotfix/mailing_settings'

* hotfix/mailing_settings:
  mail settings
Merge branch 'master' of heroku.com:dry-oasis-3242

* 'master' of heroku.com:dry-oasis-3242:
  mail settings
change og image