Merge origin/master

Conflicts:
	SupplyChainCentral/src/controllers/ReportingController.java
	SupplyChainCentral/src/windows/ReportingWindow.java
Merge origin/master

Conflicts:
	SupplyChainCentral/src/controllers/SimulationController.java
Merge origin/master

Conflicts:
	SupplyChainCentral/src/controllers/SimulationController.java