video upload fixes
Merge branch 'master' of https://github.com/Inlife/video-cube