Running server now accepts websocket-connections
Merge branch 'master' of github.com:mattiskan/novia

Conflicts:
	gameserver/src/ClientConnection.h
	gameserver/src/ConnectionReceiver.cpp