test struts2 convention
struts2 resultset test
Merge remote-tracking branch 'origin/study'

Conflicts:
	web/struts2/velocity.log