changes for reset password form
Merge branch 'develop' into tvw