Merge origin/master

Added javadocs to SpaceTraders

Conflicts:
	src/spacetraders/NewGameController.java