made a bunch of changes for the video demo
Merge branch 'master' into visual_refresh
Merge branch 'visual_refresh'