Merge branch 'netcore/feature/align-namespaces' into netcore/feature/align-infrastructure-namespaces

# Conflicts:
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs

src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json

@@ -1,4 +1,4 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,

src/Umbraco.Web.UI.NetCore/Startup.cs

@@ -59,7 +59,6 @@ namespace Umbraco.Cms.Web.UI.NetCore
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseUmbraco();
             app.UseUmbracoBackOffice();
             app.UseUmbracoWebsite();
         }

src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml

@@ -1,4 +1,4 @@
-@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel>
+@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel>
 @{
     if (!Model.Any()) { return; }
 }

src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml

@@ -1,4 +1,4 @@
-@using System.Web
+@using System.Web
 @using Microsoft.AspNetCore.Html
 @using Newtonsoft.Json.Linq
 @inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>

src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml

@@ -1,4 +1,4 @@
-@using System.Web
+@using System.Web
 @using Microsoft.AspNetCore.Html
 @using Newtonsoft.Json.Linq
 @inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>

src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml

@@ -1,4 +1,4 @@
-@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
+@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
 
 @if (Model.value != null)
 {