新增自定义滚动条
Merge branch 'master' of github.com:meihua-info/ui

Conflicts:
	js/seajs-config.js