'选课修改：需考核与非考核课程分开显示'
'添加选课提示和修复小bug'
'注释掉选课提示部分'
完善我的选课&&修改资源bug修复
查看课程信息添加提供者，资源数，是否有考试&&课程与课程评论分开
实现课程评论查看分页
实现新评判规则后的考试评分
首页添加在线学习模块
用户不需登陆就可在线学习
少上传了个文件
delete删除功能
Merge branch 'KeithChen' of https://github.com/HCI-webdesigner/Dean into DEV
Merge branch 'leaf' of https://github.com/HCI-webdesigner/Dean into DEV
Merge branch 'vincent' of https://github.com/HCI-webdesigner/Dean into DEV
解决leaf&&vincent冲突
Conflicts:
	app/controllers/Application.java
	app/views/Exams/addQuestion.html
	app/views/Exams/editQuestion.html
Merge branch 'auxiliaryChen' of https://github.com/HCI-webdesigner/Dean into dev
4.11
Conflicts:
	app/controllers/Exams.java
	app/models/Exam.java
	app/views/Examinations/showCurriculumExamination.html
	app/views/Exams/addExam.html
	app/views/Exams/addQuestion.html
	app/views/Exams/editExam.html
	app/views/Exams/editQuestion.html
	app/views/Exams/showQuestions.html
Merge branch 'hci_biao' of https://github.com/HCI-webdesigner/Dean into dev
merge hci_biao branch
Conflicts:
	app/controllers/Studyings.java
	app/views/Studyings/showStudyResource.html
修改	modified:   app/controllers/Exams.java
	modified:   app/views/Application/base.html
	modified:   app/views/manager.html的问题
资源为null提示小修改
修改manager.html中左侧导航的权限
把SessionManager改为utils，修改课程学习时候课程信息显示的css