Merge origin/master

Conflicts:
	src/connect4/HelpMenuView.java
	src/connect4/MainMenuView.java
	src/connect4/PlayerName.java
	src/connect4/SettingsMenuView.java
	src/connect4/StatsMenuView.java
Merge origin/master