Merge branch 'v8/contrib' into v8/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tour.service.js

src/Umbraco.Web/Models/BackOfficeTour.cs

@@ -40,5 +40,8 @@ namespace Umbraco.Web.Models
 
         [DataMember(Name = "culture")]
         public string Culture { get; set; }
+
+        [DataMember(Name = "contentType")]
+        public string ContentType { get; set; }
     }
 }

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

@@ -5,6 +5,7 @@ namespace Umbraco.Web.Models.ContentEditing
     [DataContract(Name = "contentType", Namespace = "")]
     public class MediaTypeDisplay : ContentTypeCompositionDisplay<PropertyTypeDisplay>
     {
-
+        [DataMember(Name = "isSystemMediaType")]
+        public bool IsSystemMediaType { get; set; }
     }
 }

src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs

@@ -145,6 +145,7 @@ namespace Umbraco.Web.Models.Mapping
 
             //default listview
             target.ListViewEditorName = Constants.Conventions.DataTypes.ListViewPrefix + "Media";
+            target.IsSystemMediaType = source.IsSystemMediaType();
 
             if (string.IsNullOrEmpty(source.Name)) return;
 
@@ -492,7 +493,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Udi = MapContentTypeUdi(source);
             target.UpdateDate = source.UpdateDate;
 
-            target.AllowedContentTypes = source.AllowedContentTypes.Select(x => x.Id.Value);
+            target.AllowedContentTypes = source.AllowedContentTypes.OrderBy(c => c.SortOrder).Select(x => x.Id.Value);
             target.CompositeContentTypes = source.ContentTypeComposition.Select(x => x.Alias);
             target.LockedCompositeContentTypes = MapLockedCompositions(source);
         }