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

src/Umbraco.Web.UI.NetCore/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "umbracoDbDSN": ""
+    "umbracoDbDSN": "Server=(LocalDB)\\Umbraco;Database=NetCore;Integrated Security=true"
   },
   "Serilog": {
     "MinimumLevel": {
@@ -39,7 +39,7 @@
       },
       "RuntimeMinification": {
         "dataFolder": "App_Data/TEMP/Smidge",
-        "version": "637395756047165417"
+        "version": "637429346786793415"
       },
       "Security": {
         "KeepUserLoggedIn": false,
@@ -71,4 +71,4 @@
       }
     }
   }
-}
+}