Merge branch 'master' of https://github.com/pluto-/GCom

Conflicts:
	client/src/client/Client.java