Correct propagation events in contact line
Merge branch 'master' of https://github.com/Hoshiyo/IHM

Conflicts:
	src/main/webapp/WEB-INF/view/index.jsp
Merge branch 'master' of https://github.com/Hoshiyo/IHM

Conflicts:
	src/main/webapp/WEB-INF/view/index.jsp
	src/main/webapp/resources/themes/js/functions.js