Videos are now easier to add
Merge remote-tracking branch 'origin/dev' into sdm