Got macro parameter editors inserting macros into the template editor for both webforms and mvc, created unit tests for macro syntax in macroservice. Removed the hard coded span8 for input elements for property editors - need to figure out a different way to set their width.

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

@@ -27,6 +27,12 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required]
         public int ParentId { get; set; }
 
+        /// <summary>
+        /// This will only be populated for some entities like macros
+        /// </summary>
+        [DataMember(Name = "alias")]
+        public string Alias { get; set; }
+
         /// <summary>
         /// For now we'll exclude this from the json results, this is needed for permissions check filtering
         /// </summary>