arcView created
MapCanvas updated
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
improoved map
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into develop
Merge branch 'master' of https://github.com/dragibus-4if/dragibus-devoo
gitignore update
Merge branch 'report'
Merge branch 'develop' of https://github.com/dragibus-4if/dragibus-devoo into feature/map-init

Conflicts:
	OptiFret/src/view/DeliverySheetView.java
Rename views
Merge branch 'feature/map-init' of github.com:dragibus-4if/dragibus-devoo into feature/map-init
Passage des tests sur la tsp. GTFO motherfucker
Merge branch 'master' into feature/export
Merge branch 'feature/tsp'
Merge branch 'master' into feature/export
Big fix/rename