error CC
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G2

Conflicts:
	firstServlet/WebContent/WEB-INF/web.xml
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G2
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G2
modif Groupe_de_travail
modif groupe_de_travail