fuck you
Merge branch 'master' of https://github.com/hamisto27/WebServices.git

Conflicts:
	seriespotAPI/app/controllers/UserController.java