Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/view/WelcomeScreenController.java
Merge origin/master