Merge branch 'account-activation-password-reset'

Finish branch account activation & password reset
Merge branch 'master' of heroku.com:rocky-hamlet-8988

Pull from Heroku to solve problems