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