changed the content type with content type by extension
Merge branch 'staging'