Updated mailer settings
Merge remote-tracking branch 'upstream/develop' into develop
Fixed mailer in production
Merge remote-tracking branch 'upstream/develop' into develop
Trying to fix no-reply address