Merge pull request #1714 from ollierattue/develop

Working mime types for xls and xlsx file extensions