refactoring
added local videos
Merge branch 'mail' into notebook