Started PMD
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/player/Ship.java
	SpaceTrader/src/spacetrader/view/SolarSystemViewController.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/cosmos/Universe.java