test forgoten pass
Merge with forgot_password_feature branch and resolve merge conflicts.