添加考试页面还有评定分数逻辑（没有页面样式）
修改readme
证书完善
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean into KeithChen
冲突的一些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
添加登录验证
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean into leaf

同步master
用户excel导入增加密码
改为prod
改变编译器为1.6
修改后台css
修复ie7下的兼容性问题
fix css
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean
修改showActivityCategory的button的type
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean into leaf

update
把参数写到Config中