commit sc2
Merge branch 'master' of https://github.com/Okazari/idmprojet

Conflicts:
	blablabla.txt
	org.idmproject.dsl/src/MmuiDsl/MmuiDsl.xtext