Html email for reset password
Merge branch 'origin/master'