Changed some class names
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Client_GUI.java