Merge origin/master

Conflicts:
	SupplyChainCentral/src/controllers/SimulationController.java