Jokyou frist commit
Merge branch 'master' of https://github.com/gdmc-louis/GraduateWork

Conflicts:
	src/struts.xml
	src/struts_ozq.xml