added MIME types for opendocument
bug fix and improved file upload, asking the user what to do on succesfull upload
Merge branch 'origin/master'