Merge branch 'dev-v8' into temp-U4-11127

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js

src/Umbraco.Web/Models/ContentEditing/AuditLog.cs

@@ -1,12 +1,8 @@
 using System;
 using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Umbraco.Core.Models;
 
 namespace Umbraco.Web.Models.ContentEditing
 {
-
     [DataContract(Name = "auditLog", Namespace = "")]
     public class AuditLog
     {

src/Umbraco.Web/Models/ContentEditing/BackOfficePreview.cs

@@ -6,6 +6,7 @@
     public class BackOfficePreview
     {
         public string PreviewExtendedHeaderView { get; set; }
+
         //TODO: We could potentially have a 'footer' view
         public bool DisableDevicePreview { get; set; }
     }

src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs

@@ -75,7 +75,7 @@ namespace Umbraco.Web.Models.ContentEditing
             {
                 return IconIsClass
                     ? string.Empty
-                    : string.Format("{0}images/umbraco/{1}", GlobalSettings.Path.EnsureEndsWith("/"), Icon);
+                    : string.Format("{0}images/umbraco/{1}", UmbracoConfig.For.GlobalSettings().Path.EnsureEndsWith("/"), Icon);
             }
         }