Merge origin/master

Conflicts:
	SupplyChainCentral/src/controllers/Controller.java
	SupplyChainCentral/src/controllers/SchedulingController.java
	SupplyChainCentral/src/tools/DialogBox.java
	SupplyChainCentral/src/windows/LoginWindow.java
	SupplyChainCentral/src/windows/MainWindow.java
Merge origin/master

Conflicts:
	SupplyChainCentral/src/windows/ShipmentWindow.java