dashboard changed
heroku merge conflict fixed
mailer added