Merge branch 'patch-7.13.1' into dev-v7

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs

src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js

@@ -139,6 +139,11 @@ function ColorPickerController($scope) {
         if (!$scope.model.value)
             return;
 
+        // Backwards compatibility, the color used to be stored as a hex value only
+        if (typeof $scope.model.value === "string") {
+            $scope.model.value = { value: $scope.model.value, label: $scope.model.value };
+        }
+
         // Complex color (value and label)?
         if (!$scope.model.value.hasOwnProperty("value"))
             return;

src/Umbraco.Web.UI/.eslintignore

@@ -1,3 +0,0 @@
-
-/Umbraco/**
-/Umbraco_Client/**

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -520,7 +520,6 @@
     </Content>
     <Content Include="Umbraco\Install\Views\Web.config" />
     <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
-    <Content Include=".eslintignore" />
     <None Include="Config\404handlers.Release.config">
       <DependentUpon>404handlers.config</DependentUpon>
     </None>
@@ -1042,6 +1041,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
           <DevelopmentServerPort>7140</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:7140</IISUrl>
+          <DevelopmentServerPort>7131</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:7131</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>