chargement des livraisons marche, todo les ajouter a la deliveryround ainsi que l'entrepôt
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é
livraisons ajouté à deliveryRound
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