lhb 3rd commit
Merge branch 'master' of https://github.com/gdmc-louis/GraduateWork.git

Conflicts:
	WebRoot/WEB-INF/classes/zjc.xml
	src/zjc.xml