made delete video conditonal
Merge branch 'development' of github.com:americangenius/mx-2 into development