Merge branch 'master' of github.com:jouyouyun/life_search
Merge remote-tracking branch 'origin/widget'
Merge branch 'master' of github.com:jouyouyun/life_search
add movie move voice