Merge branch 'product' of github.com:gokuai/fengcloud into product
Merge branch 'product' of github.com:gokuai/fengcloud into product
修复非图片文件请求截图的bg
Merge branch 'product'

Conflicts:
	app/scripts/common.js
	app/scripts/services/services.js
Merge branch 'master' into translate