添加考试页面还有评定分数逻辑（没有页面样式）
修改readme
添加登录验证
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中
添加doc转swf和pdf转swf
完成在线看office和pdf
添加jwplayer
Merge branch 'KeithChen' of https://github.com/HCI-webdesigner/Dean into dev

merge with KeithChen
Merge branch 'exam' of https://github.com/HCI-webdesigner/Dean into dev
fix
Conflicts:
	app/controllers/Examinations.java
	app/models/Curriculum.java
	app/views/Examinations/correctingPaper.html
fix again