Merge branch 'netcore/netcore' into netcore/feature/auto-routing

# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs

src/Umbraco.Web/Editors/BackOfficeController.cs

@@ -194,6 +194,7 @@ namespace Umbraco.Web.Editors
         /// </summary>
         /// <param name="culture"></param>
         /// <returns></returns>
+        /// <remarks>Migrated already to .Net Core</remarks>
         [HttpGet]
         public JsonNetResult LocalizedText(string culture = null)
         {
@@ -239,7 +240,8 @@ namespace Umbraco.Web.Editors
 
             return JavaScript(result);
         }
-
+        
+        /// Migrated already to .Net Core
         [UmbracoAuthorize(Order = 0)]
         [HttpGet]
         public JsonNetResult GetGridConfig()

src/Umbraco.Web/Mvc/JsonNetResult.cs

@@ -13,6 +13,7 @@ namespace Umbraco.Web.Mvc
     /// <summary>
     /// Custom json result using newtonsoft json.net
     /// </summary>
+    /// Migrated already to .Net Core
     public class JsonNetResult : ActionResult
     {
         public Encoding ContentEncoding { get; set; }

src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs

@@ -14,6 +14,7 @@ namespace Umbraco.Web.Mvc
     /// <summary>
     /// Redirects to an Umbraco page by Id or Entity
     /// </summary>
+    /// Migrated already to .Net Core
     public class RedirectToUmbracoPageResult : ActionResult
     {
         private IPublishedContent _publishedContent;

src/Umbraco.Web/Mvc/RedirectToUmbracoUrlResult.cs

@@ -11,6 +11,7 @@ namespace Umbraco.Web.Mvc
     /// to the current page but the current page is actually a rewritten URL normally done with something like
     /// Server.Transfer. It is also handy if you want to persist the query strings.
     /// </remarks>
+    /// Migrated already to .Net Core
     public class RedirectToUmbracoUrlResult : ActionResult
     {
         private readonly IUmbracoContext _umbracoContext;

src/Umbraco.Web/Mvc/RouteDefinition.cs

@@ -7,6 +7,7 @@ namespace Umbraco.Web.Mvc
     /// <summary>
     /// Represents the data required to route to a specific controller/action during an Umbraco request
     /// </summary>
+    /// Migrated already to .Net Core
     public class RouteDefinition
     {
         public string ControllerName { get; set; }

src/Umbraco.Web/Mvc/SurfaceController.cs

@@ -13,6 +13,8 @@ namespace Umbraco.Web.Mvc
     /// <summary>
     /// Provides a base class for front-end add-in controllers.
     /// </summary>
+    /// Migrated already to .Net Core without MergeModelStateToChildAction and MergeParentContextViewData action filters
+    /// TODO: Migrate MergeModelStateToChildAction and MergeParentContextViewData action filters
     [MergeModelStateToChildAction]
     [MergeParentContextViewData]
     public abstract class SurfaceController : PluginController

src/Umbraco.Web/Mvc/UmbracoPageResult.cs

@@ -10,6 +10,7 @@ namespace Umbraco.Web.Mvc
     /// <summary>
     /// Used by posted forms to proxy the result to the page in which the current URL matches on
     /// </summary>
+    /// Migrated already to .Net Core
     public class UmbracoPageResult : ActionResult
     {
         private readonly IProfilingLogger _profilingLogger;