Seriously ?
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop
Merge branch 'feature/add-warehouse' into develop
Fix XML bug
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/controller/MainController.java
	OptiFret/src/model/DeliverySheet.java
	OptiFret/src/model/RoadNetwork.java
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
Remise de putain de getNodeById de merde Pierre t'es trop relou t'as cassé l'UML
Fix boutons grisés
Mouhahaha somenight i really want to PLAAAYYYYY
correction de la couleur de minimal d'une deliveryview lorsqu'on le replie
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
many pète sa mère improvements
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/controller/MainController.java
Export Qui marche BIENG TAVU
Javadoc Delivery
Javadoc TimeSlot
Unification Javadoc, suppression DeliveryEmployee
Voila ça marche. JM arrete de merger n'importe comment. Ca fonctionnait avant
Ajout du trajet de l'entrepot à la première livraison
Suppr ancien code