Users REST update
Merge branch 'REST' into develop

Conflicts:
	server/config/routes.js