添加课程类型
Merge remote-tracking branch 'origin/master'

Conflicts:
	SchoolInfoMS/src/com/sims/spring/configxml/applicationContext.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'