upload fixes
Merge branch 'master' of https://github.com/trajkovvlatko/video-app-client