reset password pages per Diana's bugs
Merge pull request #70 from bramwell2010/develop

reset password pages per Diana's bugs
Merge pull request #71 from athahar/develop

Develop