Merge pull request #3766 from daviddavis/temp/20140303113408
Content Views: Added test for updating composites
Merge pull request #3766 from daviddavis/temp/20140303113408
Content Views: Added test for updating composites