inital user commit
Added user stuff
Fixing bugs
Upgrade to 7.0. Full user system
fixing bug
Merge pull request #1 from jeregrine/user_stuff

User stuff