代码合并
Merge branch 'master' of https://github.com/liguorui/xiaopiu

Conflicts:
	js/tool/mutiView.js
解决冲突