Merge origin/master

Conflicts:
	ruzzle/src/ruzzle/Main.java