Merge origin/master

Conflicts:
	connectFour/View/MainController.java
	connectFour/View/ViewMenu.java
	connectFour/entity/Game.java
Merge origin/master

Conflicts:
	connectFour/View/MainController.java
Merge origin/master