Merge origin/master

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