Content Views: handle composite content views.

Allow creation and update of composite content views.
Merge pull request #3771 from waldenraines/composite-content-views

Content Views: handle composite content views.