Added users.routes.server.controller.js to the list of controllers to call when requiring controllers for the routes.
Merge branch 'c1moore_branch' into dev