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

Conflicts:
	Gestion Competences/src/fr/imie/formation/DAO/CompetenceDAO.java
	Servlets/WebContent/CompReadOnly.jsp
	Servlets/WebContent/ListComp.jsp
	Servlets/WebContent/UserReadOnly.jsp
	Servlets/src/fr/imie/servlet/CompForm.java
Merge branch 'master' of https://github.com/imie-source/DLCDI08-ICompetence-G3