yay checkstyle additions!
Merge origin/master

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

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

Conflicts:
	SpaceTrader/src/spacetrader/economy/Company.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/economy/Company.java
Merge origin/master