Instead of detecting image by mimetype we do it by extension
Merge branch 'features/image-detection'