use new method of resizing files
Merge branch 'hotfix/file-upload' into dev