Conflit résolut
Merge branch 'master' of https://github.com/mirben/SAG.git

Conflicts:
	SAG/src/com/sag/business/test/DomaineDaoImplTest.java