coucou
vtfyt
Merge branch 'master' of https://github.com/gqueste/eventManager.git

Conflicts:
	WebContent/jsp/index.jsp
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	target/m2e-wtp/web-resources/META-INF/maven/eventManager/eventManager/pom.properties