Added ForgotPassword.cs and updated stuff
Fixed conflicts
Fixed conflict