活动页面略微修改
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean
活动显示页面略微修改
添加证书页面
添加证书页面
考试功能错误修复
Merge branch 'master' of github.com:HCI-webdesigner/Dean
冲突的一些commit
考试纠错第二弹！
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean into KeithChen

Conflicts:
	app/controllers/Examinations.java
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean into KeithChen

Conflicts:
	app/controllers/Examinations.java