In process of implementing integration of XMLReader with an ObjectLoader to load all types.  Classes may extend LoadableType to inherit useful functionality in regards to this integration.
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/economy/TradeGood.java
Small changes to brush things up after the merge