ItemCategoryController is now a Resource Controller
Updated routes
UserController (formerly AdministrationController) is now a Resource Controller
Updated routes and views
Merge origin/master