Merge branch 'temp8' into temp8-U4-11173

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

@@ -46,5 +46,8 @@ namespace Umbraco.Web.Models.ContentEditing
         //SD: Is this really needed ?
         [DataMember(Name = "groupId")]
         public int GroupId { get; set; }
+
+        [DataMember(Name = "allowCultureVariant")]
+        public bool AllowCultureVariant { get; set; }
     }
 }

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

@@ -52,14 +52,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// Member Group
         /// </summary>
         MemberGroup,
-
-        /// <summary>
-        /// Content Item
-        /// </summary>
-        [Obsolete("This is not used and will be removed in future versions")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        ContentItem,
-
+        
         /// <summary>
         /// "Media Type
         /// </summary>

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

@@ -25,13 +25,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// </summary>
         [DataMember(Name = "emailHash")]
         public string EmailHash { get; set; }
-
-        [Obsolete("This should not be used it exists for legacy reasons only, use user groups instead, it will be removed in future versions")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [ReadOnly(true)]
-        [DataMember(Name = "userType")]
-        public string UserType { get; set; }
-
+        
         [ReadOnly(true)]
         [DataMember(Name = "userGroups")]
         public string[] UserGroups { get; set; }