Merge origin/master

Conflicts:
	src/controllers/SpaceTradersController.java