server module initiated
Merge remote-tracking branch 'origin/master'

Conflicts:
	rotundr/src/ru/stereohorse/rotundr/game/GameState.java