video task fixes, create user controller fixes
Merge remote-tracking branch 'origin/master'
video task fixes, create user controller fixes