mailer
fixed configus for mailer
Merge branch 'feature/mailer' into develop

* feature/mailer:
  fixed configus for mailer
  mailer