Fixed mimetypes in some situations

Based on https://github.com/ps3mediaserver/ps3mediaserver/commit/7a2cdb492677f7ba10e2a1dcf9e3ff6967ca7034
Merge pull request #144 from UniversalMediaServer/PMS

Merge with latest PMS