totally finished video upload by user
Merge branch 'master' of https://github.com/g2scott/caan