code cleanup and addition of integration tests for UserController
Merge branch 'master' of https://github.com/sbhachu/JEE