Merge origin/master

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

plus checkstyle additions!
Merge origin/master