fix files controller merge error
Merge branch '505-enforce_metadata_input_at_web_upload' into develop