update jsp -> html/jquery
Merge branch 'master' of https://github.com/mirben/SAG.git

Conflicts:
	SAG/WebContent/WEB-INF/sag-servlet.xml