toto
totoMerge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G1

Conflicts:
	iCompetence/src/org/imie/DAO/CompetenceDAO.java
	iCompetence/src/org/imie/IService/IServiceCompetence.java
test
modification userUpdateForm par fatou
modif userServletUpdateForm par fatou

Conflicts:
	iCompetenceServlet/WebContent/UserUpdateServletForm.jsp
	iCompetenceServlet/WebContent/inc/style.css