删除冗余CSS
Merge branch 'se_course' of http://10.131.252.71/git/g3 into se_course

Conflicts:
	WebRoot/usr/message.jsp
核对。
刚刚交错了……这个才是第二次迭代的面试版，但是服务器改回各自的本地地址了。
修正认定设定失败问题
Merge branch 'se_course' of http://10.131.252.71/git/g3 into se_course
恢复item-check-setting.jsp
Merge branch 'se_course'

Conflicts:
	WebRoot/login.jsp
	WebRoot/usr/css/message-write.css
	WebRoot/usr/css/thought.css
	WebRoot/usr/header.jsp
	WebRoot/usr/js/list-move2.js
	WebRoot/usr/message.jsp
	WebRoot/usr/thought-query.jsp
	src/applicationContext_action.xml
	src/com/score/action/QueryThoughtByPublishAction.java
修复Merge错误
Merge branch 'master' of https://github.com/GeniusYe/StudentManage

Conflicts:
	WebRoot/usr/header.jsp