update jsp (probleme javascript réglé) <jsp:text />
Merge branch 'master' of https://github.com/mirben/SAG.git

Conflicts:
	SAG/WebContent/WEB-INF/jsp/detail_company.jsp