plop
Merge remote-tracking branch 'origin/Bip' into Bip

Conflicts:
	build/classes/root/Controller/SortCentre.class
	build/classes/root/Model/Model.class