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

Conflicts:
	iCompIHM/WebContent/jsp/findAllProjects.jsp
	iCompIHM/WebContent/jsp/findAllUsers.jsp