为合并
Merge branch 'master' of github.com:hkaimin/JXJYPro

Conflicts:
	java_src/resources/struts-project.xml