clean + conflit ok
merge
Merge branch 'master' of https://github.com/m2gl-synthlab/synthlab

Conflicts:
	fr.istic.synthlab/savedInstance.synthlab