General code cleanup.
Merge branch 'master' into gui

Conflicts:
	src/gamesincommon/Gui.java