Server modification.
Merge branch 'js' of https://github.com/jsosnowski/zpr13jl into js

Conflicts:
	GameServer.cpp