better management
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into feature/map-init

Conflicts:
	OptiFret/src/controller/MainController.java
	OptiFret/src/view/ArcView.java
	OptiFret/src/view/DeliveryMap.java
	OptiFret/src/view/MainFrame.java
no message
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into feature/map-init
Merge branch 'feature/map-init' of https://github.com/dragibus-4if/dragibus-devoo into feature/map-init
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