Changes to Registration and Reset Password
Merge with master