Merge branch 'widget' of github.com:jouyouyun/life_search into widget
Merge remote-tracking branch 'origin/master' into widget
Merge remote-tracking branch 'origin/widget'