Merge origin/master

Conflicts:
	crazyConnectFour/src/HelpMenuControl.java
	crazyConnectFour/src/crazyconnectfour/HelpMenuControl.java