Merge origin/master

Conflicts:
	src/connectpuzzle/ConnectPuzzle.java