修复bug
Merge branch 'master' of github.com:gokuai/fengcloud
grunt
Merge branch 'master' of github.com:gokuai/fengcloud
grunt
grunt
修复bug
grunt
Merge branch 'master' into product

Conflicts:
	dist/chat.html
	dist/editor.html
	dist/index.html
	dist/login.html
	dist/onlineview.html
	dist/scripts/chat.0657b317.js
	dist/scripts/chat.391862c7.js
	dist/scripts/chat.9d73ab08.js
	dist/scripts/vendor.219398a8.js
	dist/scripts/vendor.6379f103.js
	dist/scripts/vendor.be8d266d.js
	dist/setting.html
	dist/styles/app.6e914654.css
	dist/styles/app.7f44a2fe.css
	dist/styles/app.9b57c895.css
	dist/tcframe.html
	dist/transfer.html
	dist/xdf_loading.html
merge master
merge product