Added login and password reset
Fixed merge conflicts