fixed user controller info to local branch
fixed merge conflict in userscontroller
Merge branch 'home'
Merge branch 'master' of github.com:JavaRabbit/UselessJunk