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