Work on populator interface
Merge remote-tracking branch 'origin/dev' into james_routes
Fixing small issue so that the tests work again
Prevent event route tests from being poisoned by earlier failing tests
Merge remote-tracking branch 'origin/dev' into james_routes
Typo
Almost done with the populator script. Need to figure out how to parameterize the invitation and decision process for attendees, and of course, implement the changes to the schemas that are currently in progress
fixed conflict in candidates.routes.test.js
candidate route tests now pass, and added user.routes.server.controller.js to git
Merge remote-tracking branch 'origin/dev' into james_branch

Conflicts:
	app/controllers/users/users.routes.server.controller.js
Merge remote-tracking branch 'origin/dev' into james_branch
Applied my changes for the third time. Git seems to be discarding them
Finished fixing problems caused by new requirement on User schema.
Merge branch 'c1moore_branch' into dev
Merge remote-tracking branch 'origin/dev' into james_branch
Switched login-enable to login_enabled.
Merge remote-tracking branch 'origin/dev' into james_branch
changed candidate route naming scheme to match other route name scheme: newfName => fName
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
made the candidate routes reference more detailed