Content Views: Adding in composite content views
Merge pull request #3715 from daviddavis/cv-composites

Content Views: Create and edit composite content views