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
Refactor history
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop
POLALA
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
no message
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop
Small stash commit
Fix missing method
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
no message
Ajout de l'entrepot dans le pathfinding
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