Checkstyle fixes galore!
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/xml/ObjectLoader.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/xml/ObjectLoader.java