解决滑动问题
Merge branch 'master' of ssh://git@github.com/zhuzhiqing/busy.git