Refactored UserController->getCurrent method
Login moved to userService
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/devicehive/controller/UserController.java