Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Fixed up content tree to check for IsContainer with the new entity AdditionalData, fixes up the AddContainerView to be part of the ContentModelMapper.