Added Mailer functionality for heroku
Pull conflict resolved