Merge origin/master

Conflicts:
	src/java/controller/Controller.java
	src/java/view/PlayerViewTest.java