WIP. Still working on the User Controller
WIP. Having problems with routes mixing annotation and rest
Merged upstream