Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/economy/TradeGood.java
	SpaceTrader/src/spacetrader/encounter/EncounterType.java
	SpaceTrader/src/spacetrader/main/SavingDriver.java
	SpaceTrader/src/spacetrader/main/SpaceTrader.java
	SpaceTrader/src/spacetrader/player/Gadget.java
	SpaceTrader/src/spacetrader/player/Mercenary.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/cosmos/Universe.java