Fix tick
Fix tests
Merge branch 'master' of https://github.com/rotanov/fefu-mmorpg

Conflicts:
	server/GameServer.cpp