Merge branch 'master' of github.com:jouyouyun/life_search
Merge branch 'widget' of github.com:jouyouyun/life_search into widget
update vip.html and img
Merge remote-tracking branch 'origin/widget'