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

Conflicts:
	firstServlet/WebContent/js.js
	firstServlet/WebContent/listecursus.jsp
Clovis GroupeDeTravail (manque modif)
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G2

Conflicts:
	firstServlet/WebContent/js.js
	firstServlet/WebContent/listecursus.jsp