Fixed testing. Found who broke it!
Merge branch 'dev' into james_routes

Conflicts:
	app/controllers/users/users.routes.server.controller.js