implement reset password and update login flow
merge origin master