merge master changes

Conflicts:
	src/com/cauchymop/goblob/GoGame.java