Production mailer configuration set up
Merge branch 'mailer' into dev