Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
no message
Fix load
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/controller/MainController.java
corrected and improved node selection
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
pfou
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
sa maman c'est mieux
Ajout et suppr de livraisons
Factorise le controller et nettoyage de la map
Merge branch 'develop' into feature/add-warehouse

Conflicts:
	OptiFret/src/model/DeliverySheet.java