rien de pertienent pour linstant
Merge remote-tracking branch 'origin/Bip' into Bip

Conflicts:
	src/root/Controller/SortCentre.java
	src/root/View/ConveyorPropertiesPanel.java