correction scinder
Merge branch 'master' of github.com:Seb12/SMA

Conflicts:
	project/src/java/modele/entite/Convoi.java