chargement des livraisons marche, todo les ajouter a la deliveryround ainsi que l'entrepôt
Menu item enable
Merge branch 'feature/XML' of https://github.com/dragibus-4if/dragibus-devoo into feature/XML

Conflicts:
	OptiFret/nbproject/build-impl.xml
	OptiFret/nbproject/genfiles.properties
	OptiFret/nbproject/project.properties
	OptiFret/src/model/Delivery.java
	OptiFret/src/model/TimeSlot.java
	OptiFret/src/view/DeliverySheetFrame.java
deuxième toString() de Client enlevé
Fix DeliverySheet test
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
Merge branch 'feature/map-init' into develop

Conflicts:
	OptiFret/src/controller/MainController.java
	OptiFret/test/test/DeliverySheetModelTest.java
livraisons ajouté à deliveryRound
rename DeliverySheet
Merge branch 'develop' into feature/XML

Conflicts:
	OptiFret/nbproject/build-impl.xml
	OptiFret/nbproject/genfiles.properties
	OptiFret/src/model/Client.java
	OptiFret/src/model/Delivery.java
	OptiFret/src/model/TimeSlot.java
?
Merge branch 'feature/XML' of https://github.com/dragibus-4if/dragibus-devoo into feature/XML

Conflicts:
	OptiFret/nbproject/build-impl.xml
build
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into feature/XML

Conflicts:
	OptiFret/src/model/DeliverySheet.java
build merge RoadNetwork.loadFromXML
Fix build
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
correction de l'image de deroulage
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/view/DeliveryCollapsiblePane.java
	OptiFret/src/view/DeliveryList.java
	OptiFret/src/view/MainFrame.java