Added comments to UniverseTests and updated the style constraints for the universe
fixed a minor bug in game controller
Merge origin/M9Branch into M9Branch

Conflicts:
	SpaceTrader/src/spacetrader/Ui/GameController.java
And fixed a minor bug