updating user and user manager
Merge pull request #44 from daverboy23/master

User and UserManager