Merge branch 'master' of github.com:jouyouyun/life_search
gestures before ok in zhou2 shagnwu
Merge branch 'widget' of github.com:jouyouyun/life_search into widget
Merge branch 'master' of github.com:jouyouyun/life_search
Merge branch 'widget'