Merge origin/master

Conflicts:
	SupplyChainCentral/src/windows/ShipmentWindow.java
Merge origin/master

Conflicts:
	SupplyChainCentral/nbproject/project.properties
	SupplyChainCentral/src/controllers/SchedulingController.java
	SupplyChainCentral/src/windows/ShipmentWindow.java
Merge origin/master

Conflicts:
	SupplyChainCentral/src/controllers/SchedulingController.java