Merge pull request #84 from FeverTeam/dev-cold

Dev cold
Merge pull request #85 from FeverTeam/dev

Dev
调整关于状态转换的接口正确解析JSON数据。
Merge pull request #87 from FeverTeam/dev-iron

Dev iron
Merge pull request #89 from FeverTeam/dev-cold

更新注册脚本
Merge pull request #91 from FeverTeam/dev-cold

Dev cold
Merge pull request #93 from FeverTeam/dev-cold

o
Merge pull request #95 from FeverTeam/dev-cold

o
Merge pull request #97 from FeverTeam/dev-cold

完成PPT文件上传功能：修改uploadifive源码使其支持自定义Header
Merge pull request #99 from FeverTeam/dev

更新注册脚本、	完成PPT文件上传功能：1、修改uploadifive源码使其支持自定义Header
Merge pull request #100 from FeverTeam/dev-cold

更新部分页面细节。
Merge pull request #102 from FeverTeam/dev-cold

加入Google Analysis相关代码
增加缓存时间，尝试解决内存占用过高问题。
Merge pull request #104 from FeverTeam/dev-iron

Dev iron
修正favicon为cloudslides图标
删除play默认favicon
1、适配并迁移到Bootstrap3.0；2、控制会议页面界面改进。
Merge branch 'dev-iron' into dev

Conflicts:
	LivePPT/app/views/main.scala.html
按bootstrap3更新注册页面样式，大致所有页面的完成bootstrap3的升级。更新首页布局样式。
Merge branch 'dev-iron' into dev

Conflicts:
	LivePPT/app/views/index.scala.html