Cleaning up
Finished shortest path + started convertion
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo

Conflicts:
	src/main/java/fr/insaif/jajagaa/control/Parseur.java
	src/main/java/fr/insaif/jajagaa/model/Tournee.java
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo