resolved several bugs around the active player
Merge branch 'master' of https://github.com/IntelligentSystems/PlanetWarsEngine

Conflicts:
	Engine.java