adding conveyor with confirmation
Merge remote-tracking branch 'origin/Bip' into Bip

Conflicts:
	build/classes/root/Controller/SortCentre.class
	build/classes/root/Model/JunctionPoint.class
	build/classes/root/Model/Model.class
	build/classes/root/Model/Node.class
	build/classes/root/Model/SortCentreEntrance.class
	build/classes/root/Model/SortCentreExit.class
	build/classes/root/Model/Station.class
	build/classes/root/View/View$1.class
	build/classes/root/View/View.class
	src/root/Controller/SortCentre.java
	src/root/Model/Model.java
	src/root/View/View.java