Merge origin/master

Conflicts:
	src/java/Controller/UserController.java