Merge pull request #3342 from james2doyle/2.2/new-mimes

2.2/new mimes
Conflicts:
	system/cms/modules/files/config/files.php