maj
Merge branch 'master' of https://github.com/MiageZipZap/CI_EasyES.git

Conflicts:
	IhmSpringMVC/WebContent/WEB-INF/views/include/header.jsp