Fixing bug when selecting option uploading files -refs #6863
Fixing behaviour in documents when rename nothing or overwrite is selected -refs #6863
Indentation
Indentation
Calling get_document_id() function in handle_uploaded_document
Removing query
Indentation
Removing unnecessary lines
Setting the deafult option when uploading files -refs #6863
Adding space
Indentation
Indentation
manual merge which may have broken something about MoveUploadedFile()
Fix abusive merge before pushing