dev @one: ajout de color attribute
ajout ;
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/moteur/model/Moteur.java