Merge origin/master

Conflicts:
	src/space/trader/GameUniverseScreenController.java
	src/space/trader/UpgradeShipScreenController.java