pyz version3

add action jsp
Merge branch 'cl'

Conflicts:
	src/main/resources/struts.xml