Merge origin/master

Conflicts:
	src/connect4/MainMenuView.java
Merge origin/master