Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore

# Conflicts:
#	src/Umbraco.Core/ObjectExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json

src/Umbraco.Core/Models/ContentEditing/ContentAppBadge.cs

@@ -0,0 +1,39 @@
+namespace Umbraco.Core.Models.ContentEditing
+{
+    using System.Runtime.Serialization;
+
+    using Umbraco.Core.Events;
+
+    /// <summary>
+    /// Represents a content app badge
+    /// </summary>
+    [DataContract(Name = "badge", Namespace = "")]
+    public class ContentAppBadge
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentAppBadge"/> class.
+        /// </summary>
+        public ContentAppBadge()
+        {
+            this.Type = ContentAppBadgeType.Default;
+        }
+
+        /// <summary>
+        /// Gets or sets the number displayed in the badge
+        /// </summary>
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of badge to display
+        /// </summary>
+        /// <remarks>
+        /// <para>This controls the background color of the badge.</para>
+        /// <para>Warning will display a dark yellow badge</para>
+        /// <para>Alert will display a red badge</para>
+        /// <para>Default will display a turquoise badge</para>
+        /// </remarks>
+        [DataMember(Name = "type")]
+        public ContentAppBadgeType Type { get; set; }
+    }
+}

src/Umbraco.Core/Models/ContentEditing/ContentAppBadgeType.cs

@@ -0,0 +1,24 @@
+namespace Umbraco.Core.Models.ContentEditing
+{
+    using System.Runtime.Serialization;
+
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+
+    /// <summary>
+    /// Represent the content app badge types
+    /// </summary>
+    [DataContract(Name = "contentAppBadgeType")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum ContentAppBadgeType
+    {
+        [EnumMember(Value = "default")]
+        Default = 0,
+
+        [EnumMember(Value = "warning")]
+        Warning = 1,
+
+        [EnumMember(Value = "alert")]
+        Alert = 2
+    }
+}

src/Umbraco.Core/Models/Entities/IMemberEntitySlim.cs

@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Models.Entities
+{
+    public interface IMemberEntitySlim : IContentEntitySlim
+    {
+
+    }
+}

src/Umbraco.Core/Models/Entities/MemberEntitySlim.cs

@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Models.Entities
+{
+    public class MemberEntitySlim : EntitySlim, IMemberEntitySlim
+    {
+        public string ContentTypeAlias { get; set; }
+
+        /// <inheritdoc />
+        public string ContentTypeIcon { get; set; }
+
+        /// <inheritdoc />
+        public string ContentTypeThumbnail { get; set; }
+    }
+}

src/Umbraco.Core/Models/UserExtensions.cs

@@ -67,7 +67,7 @@ namespace Umbraco.Core.Models
 
             if (user.Avatar.IsNullOrWhiteSpace())
             {
-                var gravatarHash = user.Email.ToMd5();
+                var gravatarHash = user.Email.GenerateHash<MD5>();
                 var gravatarUrl = "https://www.gravatar.com/avatar/" + gravatarHash + "?d=404";
 
                 //try Gravatar