Modify Forgotten Password E-mail Message
Merge branch 'dev'