format
Merge branch 'master' of https://github.com/lukasgol/SpringRest

Conflicts:
	NFCServer.iml
	src/main/java/application/controllers/UserController.java
return userId upon login