modif
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G4

Conflicts:
	iCompService/src/fr/imie/main/MainKeyword.java
	iCompService/src/fr/imie/service/UserService.java
	iCompService/src/fr/imie/service/interfaces/IUserService.java