Merge branch 'develop' into feature/configurable-classes
Added ini4j
Configuration added
Merge branch 'develop' into feature/configuration
Added helper
Refactor configuration
Added controller startup config
Small fix for dates
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop
Merge branch 'develop' into feature/configuration

Conflicts:
	OptiFret/src/view/NavigablePanel.java
Fix bad cast
Merge branch 'develop' into feature/configuration
Correction de cette pute d'AStar
Changement de l'affichage des chemins
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop
Mettage de couleur sur les traits des arcs (+ mode rainbow)
Fix parse
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/controller/MainController.java
better delivery view
Fix les successeurs