commentaire
test
test
Merge branch 'master' of https://github.com/cruchaue/Miage_Share.git

Conflicts:
	MIAGE_SHARE/.settings/org.eclipse.core.resources.prefs
	MIAGE_SHARE/src/share/g2/miage/util/ParametrePublique.java
test