Merge origin/master

Conflicts:
	JDG/src/jdg/Goban.java