Minor change in ClientGUI: some official stuff.
Merge branch 'master' of https://github.com/TNvGelder/Rolit

Conflicts:
	src/client/ClientGUI.java