add jstl
Merge branch 'master' of https://github.com/yanghua/hades

Conflicts:
	pom.xml