Après ajout d'une méthode pour le DSD CU2
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo

Conflicts:
	src/main/java/fr/insaif/jajagaa/model/Livraison.java
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo
Merge branch 'master' of https://github.com/IF-JAJAGA/devoo
Ajout du calcul de la tournée (complet)