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; }
     }