rename DeliverySheet
?
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