Fixed routes, added more tests
more tests
minor changes
Merge remote-tracking branch 'origin'

Conflicts:
	server/controllers/userController.js