Merge origin/ecolexpert-branche1 into ecolexpert-branche1

Conflicts:
	src/main/webapp/administration/info_etablissement.xhtml
Merge origin/ecolexpert-branche1 into ecolexpert-branche1
Merge origin/ecolexpert-branche1 into ecolexpert-branche1

Conflicts:
	src/main/webapp/administration/info_etablissement.xhtml