Added a server manager to the game.
Fixed merge issues.