Merge origin/master

Conflicts:
	connectFour/GameProject.java
	connectFour/entity/GuiPlayer.java
InputGameParams add exception
Merge origin/master

Conflicts:
	connectFour/View/MainController.java
	connectFour/View/ViewMenu.java