CMS-1442: Content Type - Rename demo content types
Merge remote branch 'origin/master'