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

Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
	src/umbraco.businesslogic/UmbracoSettings.cs

src/Umbraco.Web/Models/RequestPasswordResetModel.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models
+{
+
+    [DataContract(Name = "requestPasswordReset", Namespace = "")]
+    public class RequestPasswordResetModel
+    {
+        [Required]
+        [DataMember(Name = "email", IsRequired = true)]
+        public string Email { get; set; }
+    }
+}

src/Umbraco.Web/Models/SetPasswordModel.cs

@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models
+{
+    [DataContract(Name = "setPassword", Namespace = "")]
+    public class SetPasswordModel
+    {
+        [Required]
+        [DataMember(Name = "userId", IsRequired = true)]
+        public int UserId { get; set; }
+
+        [Required]
+        [DataMember(Name = "password", IsRequired = true)]
+        public string Password { get; set; }
+        
+        [Required]
+        [DataMember(Name = "resetCode", IsRequired = true)]
+        public string ResetCode { get; set; }
+    }
+}

src/Umbraco.Web/Models/ValidatePasswordResetCodeModel.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models
+{
+    [DataContract(Name = "validatePasswordReset", Namespace = "")]
+    public class ValidatePasswordResetCodeModel
+    {
+        [Required]
+        [DataMember(Name = "userId", IsRequired = true)]
+        public int UserId { get; set; }
+        
+        [Required]
+        [DataMember(Name = "resetCode", IsRequired = true)]
+        public string ResetCode { get; set; }
+    }
+}