network
Merge branch 'master' of https://github.com/potatola/NetworkTest.git

Conflicts:
	src/common/network/ClientConnector.java