Merge pull request #13 from cloudoer/master

scrollview scroll
add popover view
fix conflict
voice done
repair bug
repair bugs