Finished setting up XML TypeLoader integration
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/GameController.java
	SpaceTrader/src/spacetrader/SpaceTrader.java

(As part of the merge I set up the drawing of suns to be dependant on the new setup for types as well)