Merge branch 'stream'
Merge branch 'master' into stream
Fixed the video saving function so it works fixed UI bug