Merge branch 'dev-v7.8' into temp-U4-10707

# Conflicts:
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj

src/Umbraco.Web/Models/BackOfficeTour.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Web.Models
+{
+    [DataContract(Name = "tour", Namespace = "")]
+    public class BackOfficeTour
+    {
+        [DataMember(Name = "name")]
+        public string Name { get; set; }
+        [DataMember(Name = "alias")]
+        public string Alias { get; set; }
+        [DataMember(Name = "group")]
+        public string Group { get; set; }
+        [DataMember(Name = "allowDisable")]
+        public bool AllowDisable { get; set; }
+        [DataMember(Name = "steps")]
+        public BackOfficeTourStep[] Steps { get; set; }
+    }
+}

src/Umbraco.Web/Models/BackOfficeTourFile.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models
+{
+    [DataContract(Name = "tourFile", Namespace = "")]
+    public class BackOfficeTourFile
+    {
+        /// <summary>
+        /// The file name for the tour
+        /// </summary>
+        [DataMember(Name = "fileName")]
+        public string FileName { get; set; }
+
+        /// <summary>
+        /// The plugin folder that the tour comes from
+        /// </summary>
+        /// <remarks>
+        /// If this is null it means it's a Core tour
+        /// </remarks>
+        [DataMember(Name = "pluginName")]
+        public string PluginName { get; set; }
+
+        [DataMember(Name = "tours")]
+        public IEnumerable<BackOfficeTour> Tours { get; set; }
+    }
+}

src/Umbraco.Web/Models/BackOfficeTourStep.cs

@@ -0,0 +1,23 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models
+{
+    [DataContract(Name = "step", Namespace = "")]
+    public class BackOfficeTourStep
+    {
+        [DataMember(Name = "title")]
+        public string Title { get; set; }
+        [DataMember(Name = "content")]
+        public string Content { get; set; }
+        [DataMember(Name = "type")]
+        public string Type { get; set; }
+        [DataMember(Name = "element")]
+        public string Element { get; set; }
+        [DataMember(Name = "elementPreventClick")]
+        public bool ElementPreventClick { get; set; }
+        [DataMember(Name = "backdropOpacity")]
+        public float BackdropOpacity { get; set; }
+        [DataMember(Name = "event")]
+        public string Event { get; set; }
+    }
+}