dvr scrubber
initial merge
merging my changes into video display
further merging video display, removing console debug in scrubber.js