Conflicts: build/InstallGit.cmd build/UmbracoVersion.txt src/SolutionInfo.cs src/Umbraco.Core/Configuration/UmbracoVersion.cs src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs src/Umbraco.Web/WebServices/SaveFileController.cs