Merge origin/master

Conflicts:
	src/spacetraders/NewGameController.java
Merge origin/master

Conflicts:
	src/spacetraders/NewGameController.java
Merge origin/master