Merge branch 'master' of github.com:mattiskan/novia

Conflicts:
	gameserver/src/ClientConnection.h
	gameserver/src/ConnectionReceiver.cpp
made server show which client is sending what