Merge pull request #162 from wangbailin/master

video nav
reset