Pb ressource
Merge branch 'master' of github.com:imie-source/IMIE-TOLIST-G1

Conflicts:
	.settings/org.eclipse.core.resources.prefs
Merge branch 'master' of github.com:imie-source/IMIE-TOLIST-G1