Merge origin/master

Conflicts:
	src/main/java/controller/TestController.java