Samy List Projet 11/09/13
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G1

Conflicts:
	iCompetenceServlet/WebContent/UsersServletList.jsp