Modified UserController and fixed minor bugs
Merge branch master