Merge pull request #93 from HollyDAI/master

Merge pull request #92 from HollyDAI/xr
Merge pull request #95 from HollyDAI/holly

Holly
Merge pull request #96 from HollyDAI/master

5.26
整体上传5.27.1
IT方面5.27.2，顺便把web也传了一下
整个提交一遍吧~
Merge branch 'xr' of https://github.com/HollyDAI/seweb.git into xr

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebRoot/TeacherManagement/IT_infos_setting.jsp
	WebRoot/TeacherManagement/manageResource.jsp
	WebRoot/WEB-INF/web.xml
	WebRoot/detail.jsp
	src/com/se/servlet/CourseDetailServlet.java
	src/com/se/servlet/ITInfosServlet.java
Merge pull request #97 from HollyDAI/xr

Xr
最近版合并项目
Merge pull request #99 from HollyDAI/master

holly