Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8

# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs

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

@@ -27,7 +27,7 @@ namespace Umbraco.Web.Models.ContentEditing
 
         [DataMember(Name = "template")]
         public string TemplateAlias { get; set; }
-
+
         [DataMember(Name = "allowedTemplates")]
         public IDictionary<string, string> AllowedTemplates { get; set; }
 
@@ -54,7 +54,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// </remarks>
         [DataMember(Name = "allowedActions")]
         public IEnumerable<string> AllowedActions { get; set; }
-
+
         [DataMember(Name = "isBlueprint")]
         public bool IsBlueprint { get; set; }
     }

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

@@ -2,10 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Models.Validation;

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

@@ -0,0 +1,17 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    /// <summary>
+    /// Used to create a folder with the MediaController
+    /// </summary>
+    [DataContract]
+    public class PostedFolder
+    {
+        [DataMember(Name = "parentId")]
+        public string ParentId { get; set; }
+
+        [DataMember(Name = "name")]
+        public string Name { get; set; }
+    }
+}