minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test/bin/ClientGUI.class
	Test/bin/MainScreen.class