* Updated UserManager to not use injection
Merge branch 'master' of https://github.com/tijs14tijs/ROAD
* Fixed UserService
Merge remote-tracking branch 'origin/master'

Conflicts:
	MovementService/pom.xml
	MovementService/src/main/java/road/movementservice/Server.java
	UserService/pom.xml