simplify attachedFiles controllers
Merge branch 'fileUpload-rework' into dev