Suppr ancien code
Merge branch 'develop' into feature/add-warehouse

Conflicts:
	OptiFret/src/model/DeliverySheet.java