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
Merge remote-tracking branch 'origin/dev' into james_branch
Merge remote-tracking branch 'origin/dev' into james_branch