add forgot_password, reset_password templates
merge changes