Merge remote-tracking branch 'origin/dev-v7' into master-v7

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.7.10")]
-[assembly: AssemblyInformationalVersion("7.7.10")]
+[assembly: AssemblyFileVersion("7.7.11")]
+[assembly: AssemblyInformationalVersion("7.7.11")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.7.10");
+        private static readonly Version Version = new Version("7.7.11");
 
         /// <summary>
         /// Gets the current version of Umbraco.

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

@@ -1023,9 +1023,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7710</DevelopmentServerPort>
+          <DevelopmentServerPort>7711</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7710</IISUrl>
+          <IISUrl>http://localhost:7711</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>