started to implement loadFromXML
Merge branch 'master' into feature/XML

Conflicts:
	.gitignore
	OptiFret/src/view/DeliverySheetFrame.java
Merge branch 'master' of https://github.com/dragibus-4if/dragibus-devoo into feature/XML
xml roadnetwork fini d'implementer, pas fini de tester
Merge branch 'feature/XML' of https://github.com/dragibus-4if/dragibus-devoo into feature/XML
Cleanup README
Advance first SD
Fix margins for SD
POT
Merge branch 'master' of https://github.com/dragibus-4if/dragibus-devoo
POT
Merge branch 'report' of https://github.com/dragibus-4if/dragibus-devoo into report
Merge branch 'report'
Passage des tests sur la tsp. GTFO motherfucker
Merge branch 'feature/tsp'
delete crap in DeliverySheetView
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop

Conflicts:
	OptiFret/src/view/DeliverySheetView.java
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
Merge branch 'feature/map-init' into develop
bug correction