first stupid simple attempt at video preview on browser
fix conflict
Merge branch 'master' into video-preview