Merge branch 'master' of https://github.com/HCI-webdesigner/Dean into leaf
讲活动限制设置修改为输入框
主页活动限制输入提示优化；
Merge branch 'leaf' of https://github.com/HCI-webdesigner/Dean into leaf
Merge branch 'dev' of https://github.com/HCI-webdesigner/Dean into leaf
删除.setting
彻底删除.setting
修改ignore文件
delete gitignore
从新增加ignore文件
添加首页滚动图片标题
修复在ie7下滚动图片的bug
把scroll-control移到scroll-box外
添加首页证书验证功能
修过证书显示页面;
Merge branch 'dev' of https://github.com/HCI-webdesigner/Dean into hci_biao

Conflicts:
	app/views/Activitys/showActivitys.html
修改了后台页面css样式，适应IE
修复活动修改信息页面活动状态显示不正确的bug
修改考试时候的css样式
查看题目信息的css