Prefs modif
Merge branch 'master' of https://github.com/imie-source/IMIE-TOLIST-G1

Conflicts:
	.settings/org.eclipse.core.resources.prefs