Merge pull request #3775 from daviddavis/temp/20140305081212

Content Views: Adding description for promote action
Content Views: Added tests for updating composites