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

Conflicts:
	firstServlet/WebContent/Accueil.jsp
	firstServlet/WebContent/ListeGroupeDeTravail.jsp
	firstServlet/WebContent/css/contenuaccueil.css
	firstServlet/WebContent/liste.jsp
	firstServlet/WebContent/listeMotClef.jsp
	firstServlet/WebContent/listecursus.jsp
	firstServlet/WebContent/user.jsp
	firstServlet/src/org/imie/Securite/Authentification.java
	firstServlet/src/org/imie/Securite/FiltreSecurite.java
	icompetence/src/org/imie/DAO/CompetenceDAO.java
	icompetence/src/org/imie/DAO/UserDAO.java
	icompetence/src/org/imie/Launcher.java
	icompetence/src/org/imie/Launcher.java.orig
gdt
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G2