Fix/file upload

Merged Filip Kaštovský requested to merge fix/file-upload into master

Merge request reports