不知道为什么这个文件提示修改过~
Merge branch 'dev' of https://github.com/HCI-webdesigner/Dean into auxiliaryChen
修复了合并后的bug，包括：删除题目后总分会减少，总分小于合格分数，考试页面js紊乱
hei what happens
'修复主页名称显示'
Merge branch 'dev' of https://github.com/HCI-webdesigner/Dean into hci_biao
修复
Merge branch 'leaf' of https://github.com/HCI-webdesigner/Dean into leaf

fixed the confict

Conflicts:
	app/controllers/Examinations.java
	app/views/Application/base.html
	app/views/Studyings/showResourceComment.html
	app/views/Studyings/showStudyResource.html
	app/views/manager.html