Merge pull request #32 from thatcoderguy/master

Merge changes.
Started working on  usermanager
Merge pull request #78 from widagroup/master

Started working on usermanager