merge
Merge branch 'widget' of github.com:jouyouyun/life_search into widget