Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222

Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj

src/Umbraco.Web/Models/ValidatePasswordResetCodeModel.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models
+{
+    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; }
+    }
+}