modif ihm
Merge branch 'master' of github.com:imie-source/CDI-N-09_G3

Conflicts:
	FilRouge/GEST_COMP_IMIE_IHM/WebContent/js/dashboardProject.js