MAJ Again
Merge branch 'master' of https://github.com/grimdaemon/DmChecker

Conflicts:
	src/fr/umlv/DmChecker/ObjetOptions/ObjetOptions2.java