Bjarke Berg
5dbddfffc5
Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore
# Conflicts:
# .gitignore
# src/SolutionInfo.cs
# src/Umbraco.Core/Models/PropertyType.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
# src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml