Video scrubbing
Merge branch 'master' of https://github.com/AlunAlun/impartvideoannotation