home.jsp le retour
Merge remote-tracking branch 'origin/master'

Conflicts:
	contactor/src/main/webapp/WEB-INF/home.jsp