Started converting content model mapping over to use AutoMapper to fix the composite tabs/properties. New unit tests for the mapping as well.

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.Models.ContentEditing
 {
@@ -20,5 +21,11 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required(AllowEmptyStrings = false)]
         public string Alias { get; set; }
 
+        /// <summary>
+        /// Used internally during model mapping
+        /// </summary>
+        [IgnoreDataMember]
+        internal PropertyEditor PropertyEditor { get; set; }
+
     }
 }