Added user controller, and update password action
added basic user profile setup
Merged header with with master