Merge branch 'devDan' into c1moore_branch
Added a few controllers for the User schema and added some more commits to the User schema.
Added a few more tests and corrected some syntical errors with users.routes.server.controller.js
Fixed merge conflicts.