xml,xsd,xsl
Merge branch 'master' of https://github.com/luminocean/Integration.git

Conflicts:
	CenterServer/src/logic/logicImpl/CourseServiceImpl.java
nothing
Merge branch 'master' of https://github.com/luminocean/Integration.git