fixing mailer bug
Merge branch 'staging' into develop