Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/cosmos/Universe.java
Merge origin/master