Updated the mimedetect and added a helper function to process dsids that are not in an objects content model, such as user added.
Removed debug statement.
Added two spaces to comply with coding standards.
Merge pull request #502 from MorganDawe/7.x.cwrcps-9

7.x.cwrcps 9
Correct recently broken MIME-type.
Merge pull request #508 from adam-vessey/7.x-fix-jpeg-mime

Correct recently broken MIME-type.
less batches
Merge pull request #509 from willtp87/7.x

less batches
conflict resolution
Merge branch 'qadan-7.x' into 7.x