mod emmanuel adresse
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G2

Conflicts:
	icompetence/src/org/imie/service/UserService.java