David faux commit
David faux commit

Conflicts:
	iCompetence/src/org/imie/IService/IServiceCompetence.java
David faux commit
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G1
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G1
Version FMN / SP