Merge branch 'widget' of github.com:jouyouyun/life_search into widget
Merge branch 'widget' of github.com:jouyouyun/life_search into widget
Merge branch 'master' into widget
Update CMake