update reset password: html_email, reset password web page
Merge branch 'feature_reset_password' into develop