fixed mime types
Merge branch 'master' into prod