Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/Stream2Me/build/classes/client/Connection.class
	Code/Stream2Me/build/classes/client/GUI/GUI$1.class
	Code/Stream2Me/build/classes/client/GUI/GUI$2.class
	Code/Stream2Me/build/classes/client/GUI/GUI$3.class
	Code/Stream2Me/build/classes/client/GUI/GUI.class
	Code/Stream2Me/build/classes/client/GUI/GUI.form
	Code/Stream2Me/build/classes/submit.png

Merge

GUI Update

Gui