Merge branch 'dev-v7' into master-v7

# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

src/Umbraco.Core/Sync/ColdBootType.cs

@@ -1,24 +0,0 @@
-namespace Umbraco.Core.Sync
-{
-    /// <summary>
-    /// The type of Cold Boot taking place
-    /// </summary>
-    public enum ColdBootType
-    {
-        /// <summary>
-        /// Indicates there was no cold boot
-        /// </summary>
-        NoColdBoot,
-
-        /// <summary>
-        /// This indicates that there is no lasysynced file for the current machine/appid
-        /// </summary>
-        NeverSynced,
-
-        /// <summary>
-        /// This indicates that the number of instructions needing to be processed exceeds the value stored 
-        /// for the <see cref="DatabaseServerMessengerOptions.MaxProcessingInstructionCount"/>
-        /// </summary>
-        ExceedsMaxProcessingInstructionCount
-    }
-}

src/Umbraco.Core/Sync/DatabaseServerMessenger.cs

@@ -43,11 +43,6 @@ namespace Umbraco.Core.Sync
         protected DatabaseServerMessengerOptions Options { get; private set; }
         protected ApplicationContext ApplicationContext { get { return _appContext; } }
 
-        /// <summary>
-        /// Returns the cold boot type detected for the current app domain
-        /// </summary>
-        public ColdBootType ColdBootType { get; private set; }
-
         public DatabaseServerMessenger(ApplicationContext appContext, bool distributedEnabled, DatabaseServerMessengerOptions options)
             : base(distributedEnabled)
         {
@@ -151,12 +146,11 @@ namespace Umbraco.Core.Sync
         /// </remarks>
         private void Initialize()
         {
-            ColdBootType = ColdBootType.NoColdBoot;
-
             lock (_locko)
             {
                 if (_released) return;
-                
+
+                var coldboot = false;
                 if (_lastId < 0) // never synced before
                 {
                     // we haven't synced - in this case we aren't going to sync the whole thing, we will assume this is a new
@@ -165,7 +159,7 @@ namespace Umbraco.Core.Sync
                         + " The server will build its caches and indexes, and then adjust its last synced Id to the latest found in"
                         + " the database and maintain cache updates based on that Id.");
 
-                    ColdBootType = ColdBootType.NeverSynced;
+                    coldboot = true;
                 }
                 else
                 {
@@ -181,11 +175,11 @@ namespace Umbraco.Core.Sync
                             + " to the latest found in the database and maintain cache updates based on that Id.",
                             () => count, () => Options.MaxProcessingInstructionCount);
 
-                        ColdBootType = ColdBootType.ExceedsMaxProcessingInstructionCount;
+                        coldboot = true;
                     }
                 }
 
-                if (ColdBootType != ColdBootType.NoColdBoot)
+                if (coldboot)
                 {
                     // go get the last id in the db and store it
                     // note: do it BEFORE initializing otherwise some instructions might get lost

src/Umbraco.Core/Umbraco.Core.csproj

@@ -1311,7 +1311,6 @@
     <Compile Include="Strings\ContentBaseExtensions.cs" />
     <Compile Include="Strings\Diff.cs" />
     <Compile Include="Sync\BatchedWebServiceServerMessenger.cs" />
-    <Compile Include="Sync\ColdBootType.cs" />
     <Compile Include="Sync\IServerRegistrar2.cs" />
     <Compile Include="Sync\ServerRole.cs" />
     <Compile Include="Sync\DatabaseServerMessenger.cs" />

src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html

@@ -2,6 +2,6 @@
 	<h4><localize key="prompt_unsavedChanges">You have unsaved changes</localize></h4>
 	<p><localize key="prompt_unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</localize></p>
 
-	<button class="btn" ng-click="discard(notification)"><localize key="prompt_discardChanges">Discard changes</localize></button>
-	<button class="btn btn-success" ng-click="stay(notification)" umb-auto-focus><localize key="prompt_stay">Stay</localize></button>
-</div>
+	<button class="btn btn-warning" ng-click="discard(notification)"><localize key="prompt_discardChanges">Discard changes</localize></button>
+	<button class="btn" ng-click="stay(notification)" umb-auto-focus><localize key="prompt_stay">Stay</localize></button>
+</div>