Added more content types
Merge branch 'master' into dev