user routes
Merge branch 'master' into bpdev

Conflicts:
	routes/users_routes.js
Merge branch 'bpdev'