Update MySql.Data dependency

Add unique id for TextSearch / LuceneSearch
Add unique id for TextSearch / LuceneSearch for each searcher.
2015-07-16 13:59:19 +02:00 · 2015-07-16 13:52:52 +02:00 · 2015-07-16 12:44:10 +02:00 · 2015-07-16 12:31:07 +02:00 · 2015-07-16 11:10:36 +02:00 · 2015-07-16 10:40:43 +02:00
220 changed files with 5126 additions and 2817 deletions
@@ -49,12 +49,11 @@ ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it w
 attrib +h ..\src\Umbraco.Web.UI.Client\node_modules

 ECHO Adding Web.config transform files to the NuGet package
-REN .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform

 ECHO Packing the NuGet release files
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% -Symbols
 ..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version%
                        
 IF ERRORLEVEL 1 GOTO :showerror
@@ -145,7 +145,7 @@
        DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />

    <!-- Zip the files -->
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
  </Target>

  <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>UmbracoCms.Core.AllBinaries</id>
-    <version>6.1.2</version>
-    <title>Umbraco Cms Core All Binaries</title>
-    <authors>Morten Christensen</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-    <summary>Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms</summary>
-    <language>en-US</language>
-    <tags>umbraco</tags>
-  </metadata>
-  <files>
-    <file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
-    <file src="..\_BuildOutput\bin\AutoMapper.dll" target="lib\AutoMapper.dll" />
-    <file src="..\_BuildOutput\bin\AutoMapper.Net4.dll" target="lib\AutoMapper.Net4.dll" />
-    <file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
-    <file src="..\_BuildOutput\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
-    <file src="..\_BuildOutput\bin\ClientDependency.Core.Mvc.dll" target="lib\ClientDependency.Core.Mvc.dll" />
-    <file src="..\_BuildOutput\bin\cms.dll" target="lib\cms.dll" />
-    <file src="..\_BuildOutput\bin\controls.dll" target="lib\controls.dll" />
-    <file src="..\_BuildOutput\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
-    <file src="..\_BuildOutput\bin\Examine.dll" target="lib\Examine.dll" />
-    <file src="..\_BuildOutput\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
-    <file src="..\_BuildOutput\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
-    <file src="..\_BuildOutput\bin\ImageProcessor.dll" target="lib\ImageProcessor.dll" />
-    <file src="..\_BuildOutput\bin\ImageProcessor.Web.dll" target="lib\ImageProcessor.Web.dll" />
-    <file src="..\_BuildOutput\bin\interfaces.dll" target="lib\interfaces.dll" />
-    <file src="..\_BuildOutput\bin\log4net.dll" target="lib\log4net.dll" />
-    <file src="..\_BuildOutput\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.dll" target="lib\Microsoft.Threading.Tasks.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.Extensions.dll" target="lib\Microsoft.Threading.Tasks.Extensions.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.Web.Infrastructure.dll" target="lib\Microsoft.Web.Infrastructure.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.Web.Mvc.FixedDisplayModes.dll" target="lib\Microsoft.Web.Mvc.FixedDisplayModes.dll" />
-    <file src="..\_BuildOutput\bin\MiniProfiler.dll" target="lib\MiniProfiler.dll" />
-    <file src="..\_BuildOutput\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
-    <file src="..\_BuildOutput\bin\Newtonsoft.Json.dll" target="lib\Newtonsoft.Json.dll" />
-    <file src="..\_BuildOutput\bin\NuGet.Core.dll" target="lib\NuGet.Core.dll" />
-    <file src="..\_BuildOutput\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
-    <file src="..\_BuildOutput\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
-    <file src="..\_BuildOutput\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.dll" target="lib\System.Net.Http.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.Extensions.dll" target="lib\System.Net.Http.Extensions.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.Formatting.dll" target="lib\System.Net.Http.Formatting.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.Primitives.dll" target="lib\System.Net.Http.Primitives.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.WebRequest.dll" target="lib\System.Net.Http.WebRequest.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Helpers.dll" target="lib\System.Web.Helpers.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Http.dll" target="lib\System.Web.Http.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Http.WebHost.dll" target="lib\System.Web.Http.WebHost.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Mvc.dll" target="lib\System.Web.Mvc.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Razor.dll" target="lib\System.Web.Razor.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.WebPages.Administration.dll" target="lib\System.Web.WebPages.Administration.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.WebPages.Deployment.dll" target="lib\System.Web.WebPages.Deployment.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.WebPages.dll" target="lib\System.Web.WebPages.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.WebPages.Razor.dll" target="lib\System.Web.WebPages.Razor.dll" />
-    <file src="..\_BuildOutput\bin\TidyNet.dll" target="lib\TidyNet.dll" />
-    <file src="..\_BuildOutput\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.dll" target="lib\umbraco.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
-    <file src="..\_BuildOutput\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
-    <file src="..\_BuildOutput\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
-    <file src="..\_BuildOutput\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
-  </files>
-</package>
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>UmbracoCms.Core</id>
-    <version>7.0.0</version>
-    <title>Umbraco Cms Core Binaries</title>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-    <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
-    <language>en-US</language>
-    <tags>umbraco</tags>
-  </metadata>
-  <files>
-    <file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.dll" target="lib" />
-    <file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.pdb" target="lib" />
-    <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
-
-    <file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.dll" target="lib" />
-    <file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.pdb" target="lib" />
-    <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
-
-    <file src="..\..\src\umbraco.cms\obj\Debug\cms.dll" target="lib" />
-    <file src="..\..\src\umbraco.cms\obj\Debug\cms.pdb" target="lib" />
-    <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
-
-    <file src="..\..\src\umbraco.controls\obj\Debug\controls.dll" target="lib" />
-    <file src="..\..\src\umbraco.controls\obj\Debug\controls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
-
-    <file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.dll" target="lib" />
-    <file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.pdb" target="lib" />
-    <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
-
-    <file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.dll" target="lib" />
-    <file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
-
-    <file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.dll" target="lib" />
-    <file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.pdb" target="lib" />
-    <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
-
-    <file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.dll" target="lib" />
-    <file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
-
-    <file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.dll" target="lib" />
-    <file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.pdb" target="lib" />
-    <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
-
-    <file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.dll" target="lib" />
-    <file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.pdb" target="lib" />
-    <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
-
-    <file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.dll" target="lib" />
-    <file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
-
-    <file src="..\..\src\bin\Debug\Umbraco.Web.UI.dll" target="lib" />
-    <file src="..\..\src\bin\Debug\Umbraco.Web.UI.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
-
-    <file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.dll" target="lib" />
-    <file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.pdb" target="lib" />
-    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
-  </files>
-</package>
@@ -26,13 +26,13 @@
      <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
      <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
      <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
-      <dependency id="MySql.Data" version="[6.6.5]" />
+      <dependency id="MySql.Data" version="[6.9.7, 7.0.0)" />
      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.8.3.1, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.8.4, 2.0.0)" />
      <dependency id="ClientDependency-Mvc" version="[1.8.0, 2.0.0)" />
      <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
      <dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
-      <dependency id="Examine" version="[0.1.62, 1.0.0)" />
+      <dependency id="Examine" version="[0.1.65, 1.0.0)" />
      <dependency id="ImageProcessor" version="[1.9.5, 3.0.0)" />
      <dependency id="ImageProcessor.Web" version="[3.3.1, 5.0.0)" />
    </dependencies>
@@ -49,6 +49,7 @@
    <file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
    <file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\SQLCE4Umbraco.xml" />
    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
    <file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
@@ -65,8 +66,38 @@
    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.xml" target="lib\UmbracoExamine.xml" />
    <file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
    <file src="tools\install.core.ps1" target="tools\install.ps1" />
+
+	<!-- Added to be able to produce a symbols package -->
+	<file src="..\_BuildOutput\bin\SQLCE4Umbraco.pdb" target="lib" />
+    <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
+	<file src="..\_BuildOutput\bin\businesslogic.pdb" target="lib" />
+    <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
+	<file src="..\_BuildOutput\bin\cms.pdb" target="lib" />
+    <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
+	<file src="..\_BuildOutput\bin\controls.pdb" target="lib" />
+    <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
+	<file src="..\_BuildOutput\bin\interfaces.pdb" target="lib" />
+    <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
+	<file src="..\_BuildOutput\bin\Umbraco.Core.pdb" target="lib" />
+    <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
+	<file src="..\_BuildOutput\bin\umbraco.DataLayer.pdb" target="lib" />
+    <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
+	<file src="..\_BuildOutput\bin\umbraco.editorControls.pdb" target="lib" />
+    <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
+	<file src="..\_BuildOutput\bin\umbraco.MacroEngines.pdb" target="lib" />
+    <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
+	<file src="..\_BuildOutput\bin\umbraco.providers.pdb" target="lib" />
+    <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
+	<file src="..\_BuildOutput\bin\umbraco.pdb" target="lib" />
+    <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
+	<file src="..\_BuildOutput\bin\Umbraco.Web.UI.pdb" target="lib" />
+    <file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
+	<file src="..\_BuildOutput\bin\UmbracoExamine.pdb" target="lib" />
+    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />	
  </files>
 </package>
@@ -37,8 +37,10 @@
    <DbProviderFactories xdt:Transform="InsertIfMissing">
      <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
-      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
+      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />	  
+      <add invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="Remove" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+      <add invariant="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(type)" />
    </DbProviderFactories>
  </system.data>
  <clientDependency xdt:Transform="RemoveAttributes(version)" />
@@ -1,3 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.2.5
-RC
+7.2.8
@@ -11,5 +11,5 @@ using System.Resources;

 [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyFileVersion("7.2.5")]
-[assembly: AssemblyInformationalVersion("7.2.5-RC")]
+[assembly: AssemblyFileVersion("7.2.8")]
+[assembly: AssemblyInformationalVersion("7.2.8")]
@@ -1,15 +1,12 @@
 using System;
 using System.Configuration;
 using System.Threading;
-using System.Web;
-using System.Web.Caching;
-using Umbraco.Core.Cache;
+using System.Threading.Tasks;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Services;
-
+using Umbraco.Core.Sync;

 namespace Umbraco.Core
 {
@@ -36,6 +33,8 @@ namespace Umbraco.Core
            _databaseContext = dbContext;
            _services = serviceContext;
            ApplicationCache = cache;
+
+            Init();
        }

        /// <summary>
@@ -45,6 +44,8 @@ namespace Umbraco.Core
        public ApplicationContext(CacheHelper cache)
        {
            ApplicationCache = cache;
+
+            Init();
        }

 	    /// <summary>
@@ -60,13 +61,13 @@ namespace Umbraco.Core
 	    /// </remarks>
 	    public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
 	    {
-            if (ApplicationContext.Current != null)
+            if (Current != null)
            {
                if (!replaceContext)
-                    return ApplicationContext.Current;
+                    return Current;
            }
-            ApplicationContext.Current = appContext;
-            return ApplicationContext.Current;
+            Current = appContext;
+            return Current;
 	    }

 	    /// <summary>
@@ -85,14 +86,14 @@ namespace Umbraco.Core
 	    /// </remarks>
 	    public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
        {
-            if (ApplicationContext.Current != null)
+            if (Current != null)
            {
                if (!replaceContext)
-                    return ApplicationContext.Current;
+                    return Current;
            }
            var ctx = new ApplicationContext(dbContext, serviceContext, cache);
-            ApplicationContext.Current = ctx;
-            return ApplicationContext.Current;
+            Current = ctx;
+            return Current;
        }

 	    /// <summary>
@@ -141,57 +142,75 @@ namespace Umbraco.Core
        //   GlobalSettings.CurrentVersion returns the hard-coded "current version"
        //   the system is configured if they match
        //   if they don't, install runs, updates web.config (presumably) and updates GlobalSettings.ConfiguredStatus
-        //
-        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it... SD: I have actually remove that now!
-        //
+        
        public bool IsConfigured
        {
-            // todo - we should not do this - ok for now
-            get
-            {
-            	return Configured;
-            }
+            get { return _configured.Value; }
        }

 	    /// <summary>
-        /// The original/first url that the web application executes
+        /// The application url.
        /// </summary>
        /// <remarks>
-        /// we need to set the initial url in our ApplicationContext, this is so our keep alive service works and this must
-        /// exist on a global context because the keep alive service doesn't run in a web context.
-        /// we are NOT going to put a lock on this because locking will slow down the application and we don't really care
-        /// if two threads write to this at the exact same time during first page hit.
-        /// see: http://issues.umbraco.org/issue/U4-2059
+        /// The application url is the url that should be used by services to talk to the application,
+        /// eg keep alive or scheduled publishing services. It must exist on a global context because
+        /// some of these services may not run within a web context.
+        /// The format of the application url is:
+        /// - has a scheme (http or https)
+        /// - has the SystemDirectories.Umbraco path
+        /// - does not end with a slash
+        /// It is initialized on the first request made to the server, by UmbracoModule.EnsureApplicationUrl:
+        /// - if umbracoSettings:settings/web.routing/@umbracoApplicationUrl is set, use the value (new setting)
+        /// - if umbracoSettings:settings/scheduledTasks/@baseUrl is set, use the value (backward compatibility)
+        /// - otherwise, use the url of the (first) request.
+        /// Not locking, does not matter if several threads write to this.
+        /// See also issues:
+        /// - http://issues.umbraco.org/issue/U4-2059
+        /// - http://issues.umbraco.org/issue/U4-6788
+        /// - http://issues.umbraco.org/issue/U4-5728
+        /// - http://issues.umbraco.org/issue/U4-5391
        /// </remarks>
-        internal string OriginalRequestUrl { get; set; }
+        internal string UmbracoApplicationUrl
+        {
+            get
+            {
+                // if initialized, return
+                if (_umbracoApplicationUrl != null) return _umbracoApplicationUrl;

-        /// <summary>
-        /// Checks if the version configured matches the assembly version
-        /// </summary>
-		private bool Configured
-		{
-			get
-			{
-				try
-				{
-					string configStatus = ConfigurationStatus;
-					string currentVersion = UmbracoVersion.Current.ToString(3);
+                // try settings
+                ServerEnvironmentHelper.TrySetApplicationUrlFromSettings(this, UmbracoConfig.For.UmbracoSettings());

+                // and return what we have, may be null
+                return _umbracoApplicationUrl;
+            }
+            set
+            {
+                _umbracoApplicationUrl = value;
+            }
+        }

-					if (currentVersion != configStatus)
-					{
-						LogHelper.Info<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
-					}
-						
+        internal string _umbracoApplicationUrl; // internal for tests

-					return (configStatus == currentVersion);
-				}
-				catch
-				{
-					return false;
-				}
-			}
-		}
+        private Lazy<bool> _configured;
+        internal MainDom MainDom { get; private set; }
+       
+        private void Init()
+        {
+            MainDom = new MainDom();
+            MainDom.Acquire();
+            //Create the lazy value to resolve whether or not the application is 'configured'
+            _configured = new Lazy<bool>(() =>
+            {
+                var configStatus = ConfigurationStatus;
+                var currentVersion = UmbracoVersion.Current.ToString(3);
+                var ok = configStatus == currentVersion;
+                if (ok == false)
+                {
+                    LogHelper.Debug<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
+                }
+                return ok;
+            });
+        }

 		private string ConfigurationStatus
 		{
@@ -208,12 +227,6 @@ namespace Umbraco.Core
 			}			
 		}

-        private void AssertIsReady()
-        {
-            if (!this.IsReady)
-                throw new Exception("ApplicationContext is not ready yet.");
-        }
-
        private void AssertIsNotReady()
        {
            if (this.IsReady)
@@ -74,7 +74,7 @@ namespace Umbraco.Core
        /// <returns></returns>
        private bool ShouldExecute(ApplicationContext applicationContext)
        {
-            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.CanConnect)
+            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.IsDatabaseConfigured)
            {
                return true;
            }
@@ -84,7 +84,7 @@ namespace Umbraco.Core
                return true;
            }

-            if (!applicationContext.DatabaseContext.CanConnect && ExecuteWhenDatabaseNotConfigured)
+            if (!applicationContext.DatabaseContext.IsDatabaseConfigured && ExecuteWhenDatabaseNotConfigured)
            {
                return true;
            }
@@ -11,6 +11,15 @@ namespace Umbraco.Core
    // - this is NOT a reader/writer lock
    // - this is NOT a recursive lock
    //
+    // using a named Semaphore here and not a Mutex because mutexes have thread
+    // affinity which does not work with async situations
+    //
+    // it is important that managed code properly release the Semaphore before
+    // going down else it will maintain the lock - however note that when the
+    // whole process (w3wp.exe) goes down and all handles to the Semaphore have
+    // been closed, the Semaphore system object is destroyed - so in any case
+    // an iisreset should clean up everything
+    //
    internal class AsyncLock
    {
        private readonly SemaphoreSlim _semaphore;
@@ -54,14 +63,14 @@ namespace Umbraco.Core
            // for anonymous semaphore, use the unique releaser, else create a new one
            return _semaphore != null
                ? _releaser // (IDisposable)new SemaphoreSlimReleaser(_semaphore)
-                : (IDisposable)new NamedSemaphoreReleaser(_semaphore2);
+                : new NamedSemaphoreReleaser(_semaphore2);
        }

        public Task<IDisposable> LockAsync()
        {
            var wait = _semaphore != null 
-                ? _semaphore.WaitAsync() 
-                : WaitOneAsync(_semaphore2);
+                ? _semaphore.WaitAsync()
+                : _semaphore2.WaitOneAsync();

            return wait.IsCompleted 
                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
@@ -70,6 +79,19 @@ namespace Umbraco.Core
                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
        }

+        public Task<IDisposable> LockAsync(int millisecondsTimeout)
+        {
+            var wait = _semaphore != null
+                ? _semaphore.WaitAsync(millisecondsTimeout)
+                : _semaphore2.WaitOneAsync(millisecondsTimeout);
+
+            return wait.IsCompleted
+                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+                : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
+                    this, CancellationToken.None,
+                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+        }
+
        public IDisposable Lock()
        {
            if (_semaphore != null)
@@ -159,40 +181,5 @@ namespace Umbraco.Core
                Dispose(false);
            }
        }
-
-        // http://stackoverflow.com/questions/25382583/waiting-on-a-named-semaphore-with-waitone100-vs-waitone0-task-delay100
-        // http://blog.nerdbank.net/2011/07/c-await-for-waithandle.html
-        // F# has a AwaitWaitHandle method that accepts a time out... and seems pretty complex...
-        // version below should be OK
-
-        private static Task WaitOneAsync(WaitHandle handle)
-        {
-            var tcs = new TaskCompletionSource<object>();
-            var callbackHandleInitLock = new object();
-            lock (callbackHandleInitLock)
-            {
-                RegisteredWaitHandle callbackHandle = null;
-                // ReSharper disable once RedundantAssignment
-                callbackHandle = ThreadPool.RegisterWaitForSingleObject(
-                    handle,
-                    (state, timedOut) =>
-                    {
-                        tcs.SetResult(null);
-
-                        // we take a lock here to make sure the outer method has completed setting the local variable callbackHandle.
-                        lock (callbackHandleInitLock)
-                        {
-                            // ReSharper disable once PossibleNullReferenceException
-                            // ReSharper disable once AccessToModifiedClosure
-                            callbackHandle.Unregister(null);
-                        }
-                    },
-                    /*state:*/ null,
-                    /*millisecondsTimeOutInterval:*/ Timeout.Infinite,
-                    /*executeOnlyOnce:*/ true);
-            }
-
-            return tcs.Task;
-        }
    }
 }
@@ -54,5 +54,8 @@ namespace Umbraco.Core.Cache

        public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
        public const string DataTypePreValuesCacheKey = "UmbracoPreVal";
+
+        public const string IdToKeyCacheKey = "UI2K";
+        public const string KeyToIdCacheKey = "UK2I";
    }
 }
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Cache
        protected const string CacheItemPrefix = "umbrtmche";

        // an object that represent a value that has not been created yet
-        protected readonly object ValueNotCreated = new object();
+        protected internal static readonly object ValueNotCreated = new object();

        // manupulate the underlying cache entries
        // these *must* be called from within the appropriate locks
@@ -30,21 +30,58 @@ namespace Umbraco.Core.Cache
            return string.Format("{0}-{1}", CacheItemPrefix, key);
        }

-        protected object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        protected internal static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
        {
+            // try to generate the value and if it fails,
+            // wrap in an ExceptionHolder - would be much simpler
+            // to just use lazy.IsValueFaulted alas that field is
+            // internal
+            return new Lazy<object>(() =>
+            {
+                try
+                {
+                    return getCacheItem();
+                }
+                catch (Exception e)
+                {
+                    return new ExceptionHolder(e);
+                }
+            });
+        }
+
+        protected internal static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        {
+            // if onlyIfValueIsCreated, do not trigger value creation
+            // must return something, though, to differenciate from null values
+            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
+
+            // if execution has thrown then lazy.IsValueCreated is false
+            // and lazy.IsValueFaulted is true (but internal) so we use our
+            // own exception holder (see Lazy<T> source code) to return null
+            if (lazy.Value is ExceptionHolder) return null;
+
+            // we have a value and execution has not thrown so returning
+            // here does not throw - unless we're re-entering, take care of it
            try
            {
-                // if onlyIfValueIsCreated, do not trigger value creation
-                // must return something, though, to differenciate from null values
-                if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
                return lazy.Value;
            }
-            catch
+            catch (InvalidOperationException e)
            {
-                return null;
+                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
            }
        }

+        internal class ExceptionHolder
+        {
+            public ExceptionHolder(Exception e)
+            {
+                Exception = e;
+            }
+
+            public Exception Exception { get; private set; }
+        }
+
        #region Clear

        public virtual void ClearAllCache()
@@ -53,7 +90,7 @@ namespace Umbraco.Core.Cache
            {
                foreach (var entry in GetDictionaryEntries()
                    .ToArray())
-                    RemoveEntry((string) entry.Key);
+                    RemoveEntry((string)entry.Key);
            }
        }

@@ -68,6 +105,9 @@ namespace Umbraco.Core.Cache

        public virtual void ClearCacheObjectTypes(string typeName)
        {
+            var type = TypeFinder.GetTypeByName(typeName);
+            if (type == null) return;
+            var isInterface = type.IsInterface;
            using (WriteLock)
            {
                foreach (var entry in GetDictionaryEntries()
@@ -77,16 +117,20 @@ namespace Umbraco.Core.Cache
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType().ToString().InvariantEquals(typeName);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
                    })
                    .ToArray())
-                    RemoveEntry((string) entry.Key);
+                    RemoveEntry((string)entry.Key);
            }
        }

        public virtual void ClearCacheObjectTypes<T>()
        {
            var typeOfT = typeof(T);
+            var isInterface = typeOfT.IsInterface;
            using (WriteLock)
            {
                foreach (var entry in GetDictionaryEntries()
@@ -97,16 +141,20 @@ namespace Umbraco.Core.Cache
                        // compare on exact type, don't use "is"
                        // get non-created as NonCreatedValue & exceptions as null
                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType() == typeOfT;
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
                    })
                    .ToArray())
-                    RemoveEntry((string) entry.Key);
+                    RemoveEntry((string)entry.Key);
            }
        }

        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
        {
            var typeOfT = typeof(T);
+            var isInterface = typeOfT.IsInterface;
            var plen = CacheItemPrefix.Length + 1;
            using (WriteLock)
            {
@@ -119,11 +167,14 @@ namespace Umbraco.Core.Cache
                        // get non-created as NonCreatedValue & exceptions as null
                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
                        if (value == null) return true;
-                        return value.GetType() == typeOfT
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return (isInterface ? (value is T) : (value.GetType() == typeOfT))
                            // run predicate on the 'public key' part only, ie without prefix
-                            && predicate(((string)x.Key).Substring(plen), (T)value);
+                               && predicate(((string)x.Key).Substring(plen), (T)value);
                    }))
-                    RemoveEntry((string) entry.Key);
+                    RemoveEntry((string)entry.Key);
            }
        }

@@ -135,7 +186,7 @@ namespace Umbraco.Core.Cache
                foreach (var entry in GetDictionaryEntries()
                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
                    .ToArray())
-                    RemoveEntry((string) entry.Key);
+                    RemoveEntry((string)entry.Key);
            }
        }

@@ -147,7 +198,7 @@ namespace Umbraco.Core.Cache
                foreach (var entry in GetDictionaryEntries()
                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
                    .ToArray())
-                    RemoveEntry((string) entry.Key);
+                    RemoveEntry((string)entry.Key);
            }
        }

@@ -102,20 +102,27 @@ namespace Umbraco.Core.Cache
                // cannot create value within the lock, so if result.IsValueCreated is false, just
                // do nothing here - means that if creation throws, a race condition could cause
                // more than one thread to reach the return statement below and throw - accepted.
-                
+
                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = new Lazy<object>(getCacheItem);
+                    result = GetSafeLazy(getCacheItem);
                    ContextItems[cacheKey] = result;
                }
            }

-            // this may throw if getCacheItem throws, but this is the only place where
-            // it would throw as everywhere else we use GetLazySaveValue() to hide exceptions
-            // and pretend exceptions were never inserted into cache to begin with.
-            return result.Value;
+            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
+            // exceptions (but try again and again) and silently eat them - however at
+            // some point we have to report them - so need to re-throw here
+
+            // this does not throw anymore
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            var eh = value as ExceptionHolder;
+            if (eh != null) throw eh.Exception; // throw once!
+            return value;
        }
-        
+
        #endregion

        #region Insert
@@ -20,16 +20,22 @@ namespace Umbraco.Core.Cache

        private readonly System.Web.Caching.Cache _cache;

+        /// <summary>
+        /// Used for debugging
+        /// </summary>
+        internal Guid InstanceId { get; private set; }
+
        public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
        {
            _cache = cache;
+            InstanceId = Guid.NewGuid();
        }

        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
        {
            const string prefix = CacheItemPrefix + "-";
            return _cache.Cast<DictionaryEntry>()
-                .Where(x => x.Key is string && ((string) x.Key).StartsWith(prefix));
+                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
        }

        protected override void RemoveEntry(string key)
@@ -129,19 +135,27 @@ namespace Umbraco.Core.Cache

                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = new Lazy<object>(getCacheItem);
+                    result = GetSafeLazy(getCacheItem);
                    var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
                    var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);

                    lck.UpgradeToWriteLock();
+                    //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
                    _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
                }
            }

-            // this may throw if getCacheItem throws, but this is the only place where
-            // it would throw as everywhere else we use GetLazySaveValue() to hide exceptions
-            // and pretend exceptions were never inserted into cache to begin with.
-            return result.Value;
+            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
+            // exceptions (but try again and again) and silently eat them - however at
+            // some point we have to report them - so need to re-throw here
+
+            // this does not throw anymore
+            //return result.Value;
+
+            value = result.Value; // will not throw (safe lazy)
+            var eh = value as ExceptionHolder;
+            if (eh != null) throw eh.Exception; // throw once!
+            return value;
        }

        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
@@ -173,17 +187,18 @@ namespace Umbraco.Core.Cache
            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
            // and make sure we don't store a null value.

-            var result = new Lazy<object>(getCacheItem);
+            var result = GetSafeLazy(getCacheItem);
            var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
            if (value == null) return; // do not store null values (backward compat)

-            cacheKey = GetCacheKey(cacheKey);           
+            cacheKey = GetCacheKey(cacheKey);

            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);

            using (new WriteLock(_locker))
            {
+                //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
                _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
            }
        }
@@ -8,13 +8,51 @@ namespace Umbraco.Core.Cache
    /// </summary>
    public interface ICacheProvider
    {
+        /// <summary>
+        /// Removes all items from the cache.
+        /// </summary>
        void ClearAllCache();
+
+        /// <summary>
+        /// Removes an item from the cache, identified by its key.
+        /// </summary>
+        /// <param name="key">The key of the item.</param>
        void ClearCacheItem(string key);
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type.
+        /// </summary>
+        /// <param name="typeName">The name of the type to remove.</param>
+        /// <remarks>
+        /// <para>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</para>
+        /// <para>Performs a case-sensitive search.</para>
+        /// </remarks>
        void ClearCacheObjectTypes(string typeName);
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of the items to remove.</typeparam>
+        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</remarks>
        void ClearCacheObjectTypes<T>();
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type, satisfying a predicate.
+        /// </summary>
+        /// <typeparam name="T">The type of the items to remove.</typeparam>
+        /// <param name="predicate">The predicate to satisfy.</param>
+        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</remarks>
        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
+
        void ClearCacheByKeySearch(string keyStartsWith);
        void ClearCacheByKeyExpression(string regexString);
+
        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
        
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.Caching;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -16,30 +17,19 @@ namespace Umbraco.Core.Cache
    /// </summary>
    internal class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
    {
+
        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
        internal ObjectCache MemoryCache;

-        // an object that represent a value that has not been created yet
-        protected readonly object ValueNotCreated = new object();
+        /// <summary>
+        /// Used for debugging
+        /// </summary>
+        internal Guid InstanceId { get; private set; }

        public ObjectCacheRuntimeCacheProvider()
        {
            MemoryCache = new MemoryCache("in-memory");
-        }
-
-        protected object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
-        {
-            try
-            {
-                // if onlyIfValueIsCreated, do not trigger value creation
-                // must return something, though, to differenciate from null values
-                if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
-                return lazy.Value;
-            }
-            catch
-            {
-                return null;
-            }
+            InstanceId = Guid.NewGuid();
        }

        #region Clear
@@ -59,11 +49,14 @@ namespace Umbraco.Core.Cache
            {
                if (MemoryCache[key] == null) return;
                MemoryCache.Remove(key);
-            }            
+            }
        }

        public virtual void ClearCacheObjectTypes(string typeName)
        {
+            var type = TypeFinder.GetTypeByName(typeName);
+            if (type == null) return;
+            var isInterface = type.IsInterface;
            using (new WriteLock(_locker))
            {
                foreach (var key in MemoryCache
@@ -72,8 +65,11 @@ namespace Umbraco.Core.Cache
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType().ToString().InvariantEquals(typeName);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
                    })
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
@@ -85,15 +81,20 @@ namespace Umbraco.Core.Cache
        {
            using (new WriteLock(_locker))
            {
-                var typeOfT = typeof (T);
+                var typeOfT = typeof(T);
+                var isInterface = typeOfT.IsInterface;
                foreach (var key in MemoryCache
                    .Where(x =>
                    {
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType() == typeOfT;
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
+
                    })
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
@@ -106,16 +107,20 @@ namespace Umbraco.Core.Cache
            using (new WriteLock(_locker))
            {
                var typeOfT = typeof(T);
+                var isInterface = typeOfT.IsInterface;
                foreach (var key in MemoryCache
                    .Where(x =>
                    {
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
                        if (value == null) return true;
-                        return value.GetType() == typeOfT
-                            && predicate(x.Key, (T) value);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return (isInterface ? (value is T) : (value.GetType() == typeOfT))
+                               && predicate(x.Key, (T)value);
                    })
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
@@ -132,7 +137,7 @@ namespace Umbraco.Core.Cache
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
                    MemoryCache.Remove(key);
-            }            
+            }
        }

        public virtual void ClearCacheByKeyExpression(string regexString)
@@ -144,7 +149,7 @@ namespace Umbraco.Core.Cache
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
                    MemoryCache.Remove(key);
-            }     
+            }
        }

        #endregion
@@ -161,7 +166,7 @@ namespace Umbraco.Core.Cache
                    .ToArray(); // evaluate while locked
            }
            return entries
-                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
                .Where(x => x != null) // backward compat, don't store null values in the cache
                .ToList();
        }
@@ -176,7 +181,7 @@ namespace Umbraco.Core.Cache
                    .ToArray(); // evaluate while locked
            }
            return entries
-                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
                .Where(x => x != null) // backward compat, don't store null values in the cache
                .ToList();
        }
@@ -188,7 +193,7 @@ namespace Umbraco.Core.Cache
            {
                result = MemoryCache.Get(cacheKey) as Lazy<object>; // null if key not found
            }
-            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+            return result == null ? null : DictionaryCacheProviderBase.GetSafeLazyValue(result); // return exceptions as null
        }

        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
@@ -196,7 +201,7 @@ namespace Umbraco.Core.Cache
            return GetCacheItem(cacheKey, getCacheItem, null);
        }

-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal,CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
        {
            // see notes in HttpRuntimeCacheProvider

@@ -205,17 +210,23 @@ namespace Umbraco.Core.Cache
            using (var lck = new UpgradeableReadLock(_locker))
            {
                result = MemoryCache.Get(cacheKey) as Lazy<object>;
-                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                if (result == null || DictionaryCacheProviderBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = new Lazy<object>(getCacheItem);
+                    result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);

                    lck.UpgradeToWriteLock();
+                    //NOTE: This does an add or update
                    MemoryCache.Set(cacheKey, result, policy);
                }
            }

-            return result.Value;
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            var eh = value as DictionaryCacheProviderBase.ExceptionHolder;
+            if (eh != null) throw eh.Exception; // throw once!
+            return value;
        }

        #endregion
@@ -227,11 +238,12 @@ namespace Umbraco.Core.Cache
            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
            // and make sure we don't store a null value.

-            var result = new Lazy<object>(getCacheItem);
+            var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
            var value = result.Value; // force evaluation now
            if (value == null) return; // do not store null values (backward compat)

            var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+            //NOTE: This does an add or update
            MemoryCache.Set(cacheKey, result, policy);
        }

@@ -252,7 +264,7 @@ namespace Umbraco.Core.Cache
            {
                policy.ChangeMonitors.Add(new HostFileChangeMonitor(dependentFiles.ToList()));
            }
-            
+
            if (removedCallback != null)
            {
                policy.RemovedCallback = arguments =>
@@ -283,6 +295,6 @@ namespace Umbraco.Core.Cache
            }
            return policy;
        }
-        
+
    }
 }
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Configuration
        {
            get
            {
-                var converted = ObjectExtensions.TryConvertTo<T>(RawValue);
+                var converted = RawValue.TryConvertTo<T>();
                if (converted.Success == false)
                    throw new InvalidCastException("Could not convert value " + RawValue + " to type " + typeof(T));
                return converted.Result;
@@ -1,8 +1,9 @@
-using System.Xml.Linq;
+using System;
+using System.Xml.Linq;

 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class ContentErrorPageElement : InnerTextConfigurationElement<int>, IContentErrorPage
+    internal class ContentErrorPageElement : InnerTextConfigurationElement<string>, IContentErrorPage
    {
        public ContentErrorPageElement(XElement rawXml)
            : base(rawXml)
@@ -14,7 +15,43 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            
        }

+        public bool HasContentId
+        {
+            get { return ContentId != int.MinValue; }
+        }
+
+        public bool HasContentKey
+        {
+            get { return ContentKey != Guid.Empty; }
+        }
+
        public int ContentId
+        {
+            get
+            {
+                int parsed;
+                if (int.TryParse(Value, out parsed))
+                {
+                    return parsed;
+                }
+                return int.MinValue;
+            }
+        }
+
+        public Guid ContentKey
+        {
+            get
+            {
+                Guid parsed;
+                if (Guid.TryParse(Value, out parsed))
+                {
+                    return parsed;
+                }
+                return Guid.Empty;
+            }
+        }
+
+        public string ContentXPath
        {
            get { return Value; }
        }
@@ -1,8 +1,14 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
 {
    public interface IContentErrorPage
    {
        int ContentId { get; }
+        Guid ContentKey { get; }
+        string ContentXPath { get; }
+        bool HasContentId { get; }
+        bool HasContentKey { get; }
        string Culture { get; set; }
    }
 }
@@ -11,6 +11,8 @@
        bool DisableFindContentByIdPath { get; }

        string UrlProviderMode { get; }
+
+        string UmbracoApplicationUrl { get; }
    }

 }
@@ -30,8 +30,13 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        [ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
        public string UrlProviderMode
        {
-            get { return (string)base["urlProviderMode"]; }
+            get { return (string) base["urlProviderMode"]; }
        }

+        [ConfigurationProperty("umbracoApplicationUrl", DefaultValue = null)]
+        public string UmbracoApplicationUrl
+        {
+            get { return (string)base["umbracoApplicationUrl"]; }
+        }
    }
 }
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.2.5");
+        private static readonly Version Version = new Version("7.2.8");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration
        /// Gets the version comment (like beta or RC).
        /// </summary>
        /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "RC"; } }
+        public static string CurrentComment { get { return ""; } }

        // Get the version of the umbraco.dll by looking at a class in that dll
        // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Web;
 using AutoMapper;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Mapping;
@@ -66,7 +68,9 @@ namespace Umbraco.Core

 	        InitializeProfilerResolver();

-            _timer = DisposableTimer.DebugDuration<CoreBootManager>("Umbraco application starting", "Umbraco application startup complete");
+	        _timer = DisposableTimer.TraceDuration<CoreBootManager>(
+	            string.Format("Umbraco {0} application starting on {1}", UmbracoVersion.Current, NetworkHelper.MachineName),
+	            "Umbraco application startup complete");
            
 	        CreateApplicationCache();

@@ -95,9 +99,25 @@ namespace Umbraco.Core

            InitializeModelMappers();

-            //now we need to call the initialize methods
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationInitialized(UmbracoApplication, ApplicationContext));
+	        using (DisposableTimer.DebugDuration<CoreBootManager>(
+                () => string.Format("Executing {0} IApplicationEventHandler.OnApplicationInitialized", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                () => "Finished executing IApplicationEventHandler.OnApplicationInitialized"))
+	        {
+                //now we need to call the initialize methods
+                ApplicationEventsResolver.Current.ApplicationEventHandlers
+                    .ForEach(x =>
+                    {
+                        try
+                        {
+                            x.OnApplicationInitialized(UmbracoApplication, ApplicationContext);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Error<CoreBootManager>("An error occurred running OnApplicationInitialized for handler " + x.GetType(), ex);
+                            throw;
+                        }
+                    });
+	        }

 			_isInitialized = true;

@@ -201,11 +221,27 @@ namespace Umbraco.Core
 			if (_isStarted)
 				throw new InvalidOperationException("The boot manager has already been initialized");

-            //call OnApplicationStarting of each application events handler
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationStarting(UmbracoApplication, ApplicationContext));
+            using (DisposableTimer.DebugDuration<CoreBootManager>(
+                () => string.Format("Executing {0} IApplicationEventHandler.OnApplicationStarting", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                () => "Finished executing IApplicationEventHandler.OnApplicationStarting"))
+		    {
+		        //call OnApplicationStarting of each application events handler
+		        ApplicationEventsResolver.Current.ApplicationEventHandlers
+		            .ForEach(x =>
+		            {
+		                try
+		                {
+		                    x.OnApplicationStarting(UmbracoApplication, ApplicationContext);
+		                }
+		                catch (Exception ex)
+		                {
+		                    LogHelper.Error<CoreBootManager>("An error occurred running OnApplicationStarting for handler " + x.GetType(), ex);
+		                    throw;
+		                }
+		            });
+		    }

-            if (afterStartup != null)
+		    if (afterStartup != null)
            {
                afterStartup(ApplicationContext.Current);
            }
@@ -226,10 +262,29 @@ namespace Umbraco.Core
 				throw new InvalidOperationException("The boot manager has already been completed");

 		    FreezeResolution();
-            
-            //call OnApplicationStarting of each application events handler
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationStarted(UmbracoApplication, ApplicationContext));
+
+            //Here we need to make sure the db can be connected to
+		    EnsureDatabaseConnection();
+
+            using (DisposableTimer.DebugDuration<CoreBootManager>(
+                () => string.Format("Executing {0} IApplicationEventHandler.OnApplicationStarted", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                () => "Finished executing IApplicationEventHandler.OnApplicationStarted"))
+            {
+                //call OnApplicationStarting of each application events handler
+                ApplicationEventsResolver.Current.ApplicationEventHandlers
+                    .ForEach(x =>
+                    {
+                        try
+                        {
+                            x.OnApplicationStarted(UmbracoApplication, ApplicationContext);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Error<CoreBootManager>("An error occurred running OnApplicationStarted for handler " + x.GetType(), ex);
+                            throw;
+                        }
+                    }); 
+            }

            //Now, startup all of our legacy startup handler
            ApplicationEventsResolver.Current.InstantiateLegacyStartupHandlers();
@@ -249,6 +304,32 @@ namespace Umbraco.Core
 			return this;
 		}

+        /// <summary>
+        /// We cannot continue if the db cannot be connected to
+        /// </summary>
+        private void EnsureDatabaseConnection()
+        {
+            if (ApplicationContext.IsConfigured == false) return;
+            if (ApplicationContext.DatabaseContext.IsDatabaseConfigured == false) return;
+
+            var currentTry = 0;
+            while (currentTry < 5)
+            {
+                if (ApplicationContext.DatabaseContext.CanConnect)
+                    break;
+
+                //wait and retry
+                Thread.Sleep(1000);
+                currentTry++;
+            }
+
+            if (currentTry == 5)
+            {
+                throw new UmbracoStartupFailedException("Umbraco cannot start. A connection string is configured but the Umbraco cannot connect to the database.");
+            }
+
+        }
+
        /// <summary>
        /// Freeze resolution to not allow Resolvers to be modified
        /// </summary>
@@ -26,8 +26,6 @@ namespace Umbraco.Core
    {
        private readonly IDatabaseFactory _factory;
        private bool _configured;
-        private bool _canConnect;
-        private volatile bool _connectCheck = false;
        private readonly object _locker = new object();
        private string _connectionString;
        private string _providerName;
@@ -67,21 +65,9 @@ namespace Umbraco.Core
            get
            {
                if (IsDatabaseConfigured == false) return false;
-
-                //double check lock so that it is only checked once and is fast
-                if (_connectCheck == false)
-                {
-                    lock (_locker)
-                    {
-                        if (_canConnect == false)
-                        {
-                            _canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
-                            _connectCheck = true;
-                        }
-                    }
-                }
-
-                return _canConnect;
+                var canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
+                LogHelper.Info<DatabaseContext>("CanConnect = " + canConnect);
+                return canConnect;
            }
        }

@@ -4,69 +4,58 @@ using System.Threading;
 namespace Umbraco.Core
 {
 	/// <summary>
-	/// Abstract implementation of logic commonly required to safely handle disposable unmanaged resources.
+	/// Abstract implementation of IDisposable.
 	/// </summary>
+	/// <remarks>
+	/// Can also be used as a pattern for when inheriting is not possible.
+	/// 
+    /// See also: https://msdn.microsoft.com/en-us/library/b1yfkh5e%28v=vs.110%29.aspx
+    /// See also: https://lostechies.com/chrispatterson/2012/11/29/idisposable-done-right/
+    /// 
+    /// Note: if an object's ctor throws, it will never be disposed, and so if that ctor
+    /// has allocated disposable objects, it should take care of disposing them.
+	/// </remarks>
 	public abstract class DisposableObject : IDisposable
 	{
 		private bool _disposed;
-		private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
+	    private readonly object _locko = new object();

-		/// <summary>
-		/// Gets a value indicating whether this instance is disposed.
-		/// </summary>
-		/// <value>
-		/// 	<c>true</c> if this instance is disposed; otherwise, <c>false</c>.
-		/// </value>
-		public bool IsDisposed
-		{
-			get { return _disposed; }
-		}
+		// gets a value indicating whether this instance is disposed.
+        // for internal tests only (not thread safe)
+        //TODO make this internal + rename "Disposed" when we can break compatibility
+		public bool IsDisposed { get { return _disposed; } }

-		/// <summary>
-		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-		/// </summary>
-		/// <filterpriority>2</filterpriority>
+		// implements IDisposable
 		public void Dispose()
 		{
 			Dispose(true);
-
-			// Use SupressFinalize in case a subclass of this type implements a finalizer.
 			GC.SuppressFinalize(this);
 		}

+        // finalizer
 		~DisposableObject()
 		{
-			// Run dispose but let the class know it was due to the finalizer running.
 			Dispose(false);
 		}

-		protected virtual void Dispose(bool disposing)
+        //TODO make this private, non-virtual when we can break compatibility
+        protected virtual void Dispose(bool disposing)
 		{
-			// Only operate if we haven't already disposed
-			if (IsDisposed || !disposing) return;
+		    lock (_locko)
+		    {
+		        if (_disposed) return;
+		        _disposed = true;
+		    }

-			using (new WriteLock(_disposalLocker))
-			{
-				// Check again now we're inside the lock
-				if (IsDisposed) return;
+            DisposeUnmanagedResources();

-				// Call to actually release resources. This method is only
-				// kept separate so that the entire disposal logic can be used as a VS snippet
-				DisposeResources();
-
-				// Indicate that the instance has been disposed.
-				_disposed = true;
-			}
+            if (disposing)
+                DisposeResources();
 		}

-		/// <summary>
-		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
-		/// </summary>
 		protected abstract void DisposeResources();

 		protected virtual void DisposeUnmanagedResources()
-		{
-
-		}
+		{ }
 	}
 }
@@ -0,0 +1,18 @@
+using System;
+
+namespace Umbraco.Core.Exceptions
+{
+    /// <summary>
+    /// An exception that is thrown if the umbraco application cannnot boot
+    /// </summary>
+    public class UmbracoStartupFailedException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:System.Exception"/> class with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error. </param>
+        public UmbracoStartupFailedException(string message) : base(message)
+        {
+        }
+    }
+}
@@ -0,0 +1,45 @@
+using System.Web;
+
+namespace Umbraco.Core
+{
+    public static class HttpContextExtensions
+    {
+        public static string GetCurrentRequestIpAddress(this HttpContextBase httpContext)
+        {
+            if (httpContext == null)
+            {
+                return "Unknown, httpContext is null";
+            }
+            if (httpContext.Request == null)
+            {
+                return "Unknown, httpContext.Request is null";
+            }
+            if (httpContext.Request.ServerVariables == null)
+            {
+                return "Unknown, httpContext.Request.ServerVariables is null";
+            }
+
+            // From: http://stackoverflow.com/a/740431/5018
+
+            try
+            {
+                var ipAddress = httpContext.Request.ServerVariables["HTTP_X_FORWARDED_FOR"];
+
+                if (string.IsNullOrEmpty(ipAddress))
+                    return httpContext.Request.ServerVariables["REMOTE_ADDR"];
+
+                var addresses = ipAddress.Split(',');
+                if (addresses.Length != 0)
+                    return addresses[0];
+
+                return httpContext.Request.ServerVariables["REMOTE_ADDR"];
+            }
+            catch (System.Exception ex)
+            {
+                //This try catch is to just always ensure that no matter what we're not getting any exceptions caused since
+                // that would cause people to not be able to login
+                return string.Format("Unknown, exception occurred trying to resolve IP {0}", ex);
+            }
+        }
+    }
+}
@@ -51,7 +51,23 @@ namespace Umbraco.Core.IO
                return VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root);
        }

-		[Obsolete("Use Umbraco.Web.Templates.TemplateUtilities.ResolveUrlsFromTextString instead, this method on this class will be removed in future versions")]
+        public static Attempt<string> TryResolveUrl(string virtualPath)
+        {
+            try
+            {
+                if (virtualPath.StartsWith("~"))
+                    return Attempt.Succeed(virtualPath.Replace("~", SystemDirectories.Root).Replace("//", "/"));
+                if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
+                    return Attempt.Succeed(virtualPath);
+                return Attempt.Succeed(VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root));
+            }
+            catch (Exception ex)
+            {
+                return Attempt.Fail(virtualPath, ex);
+            }
+        }
+
+	    [Obsolete("Use Umbraco.Web.Templates.TemplateUtilities.ResolveUrlsFromTextString instead, this method on this class will be removed in future versions")]
        internal static string ResolveUrlsFromTextString(string text)
        {
            if (UmbracoConfig.For.UmbracoSettings().Content.ResolveUrlsFromTextString)
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Web;
@@ -40,9 +41,12 @@ namespace Umbraco.Core.Logging
 		/// <returns></returns>
 		private static string PrefixThreadId(string generateMessageFormat)
 		{
-			return "[Thread " + Thread.CurrentThread.ManagedThreadId + "] " + generateMessageFormat;
+		    return (_prefixThreadId ?? (_prefixThreadId = "[P" + Process.GetCurrentProcess().Id + "/T" + Thread.CurrentThread.ManagedThreadId + "/D" + AppDomain.CurrentDomain.Id + "] "))
+		           + generateMessageFormat;
 		}

+	    private static string _prefixThreadId = null;
+
 		#region Error
 		/// <summary>
 		/// Adds an error log
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Macros
 	internal class MacroTagParser
 	{
        private static readonly Regex MacroRteContent = new Regex(@"(<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(\s*?-->)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
-        private static readonly Regex MacroPersistedFormat = new Regex(@"(<\?UMBRACO_MACRO macroAlias=[""']([^""\'\n\r]+?)[""'].+?)(?:/>|>.*?</\?UMBRACO_MACRO>)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+        private static readonly Regex MacroPersistedFormat = new Regex(@"(<\?UMBRACO_MACRO (?:.+?)?macroAlias=[""']([^""\'\n\r]+?)[""'].+?)(?:/>|>.*?</\?UMBRACO_MACRO>)", RegexOptions.Compiled | RegexOptions.IgnoreCase);

 	    /// <summary>
 	    /// This formats the persisted string to something useful for the rte so that the macro renders properly since we 
@@ -0,0 +1,185 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO.MemoryMappedFiles;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web.Hosting;
+using Umbraco.Core.Logging;
+using Umbraco.Core.ObjectResolution;
+
+namespace Umbraco.Core
+{
+    // represents the main domain
+    class MainDom : IRegisteredObject
+    {
+        #region Vars
+
+        // our own lock for local consistency
+        private readonly object _locko = new object();
+
+        // async lock representing the main domain lock
+        private readonly AsyncLock _asyncLock;
+        private IDisposable _asyncLocker;
+
+        // event wait handle used to notify current main domain that it should 
+        // release the lock because a new domain wants to be the main domain
+        private readonly EventWaitHandle _signal;
+
+        // indicates whether...
+        private volatile bool _isMainDom; // we are the main domain
+        private volatile bool _signaled; // we have been signaled
+
+        // actions to run before releasing the main domain
+        private readonly SortedList<int, Action> _callbacks = new SortedList<int, Action>();
+
+        private const int LockTimeoutMilliseconds = 90000; // (1.5 * 60 * 1000) == 1 min 30 seconds
+
+        #endregion
+
+        #region Ctor
+
+        // initializes a new instance of MainDom
+        public MainDom()
+        {
+            var appId = string.Empty;
+            // HostingEnvironment.ApplicationID is null in unit tests, making ReplaceNonAlphanumericChars fail
+            if (HostingEnvironment.ApplicationID != null)
+                appId = HostingEnvironment.ApplicationID.ReplaceNonAlphanumericChars(string.Empty);
+
+            var lockName = "UMBRACO-" + appId + "-MAINDOM-LCK";
+            _asyncLock = new AsyncLock(lockName);
+
+            var eventName = "UMBRACO-" + appId + "-MAINDOM-EVT";
+            _signal = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
+        }
+
+        #endregion
+
+        // register a main domain consumer
+        public bool Register(Action release, int weight = 100)
+        {
+            return Register(null, release, weight);
+        }
+
+        // register a main domain consumer
+        public bool Register(Action install, Action release, int weight = 100)
+        {
+            lock (_locko)
+            {
+                if (_signaled) return false;
+                if (install != null)
+                    install();
+                if (release != null)
+                    _callbacks.Add(weight, release);
+                return true;
+            }
+        }
+
+        // handles the signal requesting that the main domain is released
+        private void OnSignal(string source)
+        {
+            // once signaled, we stop waiting, but then there is the hosting environment
+            // so we have to make sure that we only enter that method once
+
+            lock (_locko)
+            {
+                LogHelper.Debug<MainDom>("Signaled" + (_signaled ? " (again)" : "") + " (" + source + ").");
+                if (_signaled) return;
+                if (_isMainDom == false) return; // probably not needed
+                _signaled = true;
+            }
+
+            try
+            {
+                LogHelper.Debug<MainDom>("Stopping...");
+                foreach (var callback in _callbacks.Values)
+                {
+                    try
+                    {
+                        callback(); // no timeout on callbacks
+                    }
+                    catch (Exception e)
+                    {
+                        LogHelper.Error<MainDom>("Error while running callback, remaining callbacks will not run.", e);
+                        throw;
+                    }
+                    
+                }
+                LogHelper.Debug<MainDom>("Stopped.");
+            }
+            finally
+            {
+                // in any case...
+                _isMainDom = false;
+                _asyncLocker.Dispose();
+                LogHelper.Debug<MainDom>("Released MainDom.");
+            }
+        }
+
+        // acquires the main domain
+        public bool Acquire()
+        {
+            lock (_locko) // we don't want the hosting environment to interfere by signaling
+            {
+                // if signaled, too late to acquire, give up
+                // the handler is not installed so that would be the hosting environment
+                if (_signaled)
+                {
+                    LogHelper.Debug<MainDom>("Cannot acquire MainDom (signaled).");
+                    return false;
+                }
+
+                LogHelper.Debug<MainDom>("Acquiring MainDom...");
+
+                // signal other instances that we want the lock, then wait one the lock,
+                // which may timeout, and this is accepted - see comments below
+
+                // signal, then wait for the lock, then make sure the event is
+                // resetted (maybe there was noone listening..)
+                _signal.Set();
+
+                // if more than 1 instance reach that point, one will get the lock
+                // and the other one will timeout, which is accepted
+
+                _asyncLocker = _asyncLock.Lock(LockTimeoutMilliseconds);
+                _isMainDom = true;
+
+                // we need to reset the event, because otherwise we would end up
+                // signaling ourselves and commiting suicide immediately.
+                // only 1 instance can reach that point, but other instances may
+                // have started and be trying to get the lock - they will timeout,
+                // which is accepted
+
+                _signal.Reset();
+                _signal.WaitOneAsync()
+                    .ContinueWith(_ => OnSignal("signal"));
+
+                HostingEnvironment.RegisterObject(this);
+
+                LogHelper.Debug<MainDom>("Acquired MainDom.");
+                return true;
+            }
+        }
+
+        // gets a value indicating whether we are the main domain
+        public bool IsMainDom
+        {
+            get { return _isMainDom; }
+        }
+
+        // IRegisteredObject
+        public void Stop(bool immediate)
+        {
+            try
+            {
+                OnSignal("environment"); // will run once
+            }
+            finally
+            {
+                HostingEnvironment.UnregisterObject(this);
+            }
+        }
+    }
+}
@@ -337,74 +337,7 @@ namespace Umbraco.Core.Models
                ChangePublishedState(PublishedState.Unpublished);
            }
        }
-
-        /// <summary>
-        /// Indicates whether a specific property on the current <see cref="IContent"/> entity is dirty.
-        /// </summary>
-        /// <param name="propertyName">Name of the property to check</param>
-        /// <returns>True if Property is dirty, otherwise False</returns>
-        public override bool IsPropertyDirty(string propertyName)
-        {
-            bool existsInEntity = base.IsPropertyDirty(propertyName);
-            if (existsInEntity)
-                return true;
-
-            return Properties.Any(x => x.IsPropertyDirty(propertyName));
-        }
-
-        /// <summary>
-        /// Indicates whether the current entity is dirty.
-        /// </summary>
-        /// <returns>True if entity is dirty, otherwise False</returns>
-        public override bool IsDirty()
-        {
-            return IsEntityDirty() || IsAnyUserPropertyDirty();
-        }
-
-        /// <summary>
-        /// Returns true if only the entity properties are direty
-        /// </summary>
-        /// <returns></returns>
-        public bool IsEntityDirty()
-        {
-            return base.IsDirty();
-        }
-
-        /// <summary>
-        /// Returns true if any of the properties are dirty
-        /// </summary>
-        /// <returns></returns>
-        public bool IsAnyUserPropertyDirty()
-        {
-            return Properties.Any(x => x.IsDirty());
-        }
-
-        /// <summary>
-        /// Returns a list of all dirty user defined properties
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<string> GetDirtyUserProperties()
-        {
-            return Properties.Where(x => x.IsDirty()).Select(x => x.Alias);
-        }
-
-        /// <summary>
-        /// Resets dirty properties by clearing the dictionary used to track changes.
-        /// </summary>
-        /// <remarks>
-        /// Please note that resetting the dirty properties could potentially
-        /// obstruct the saving of a new or updated entity.
-        /// </remarks>
-        public override void ResetDirtyProperties()
-        {
-            base.ResetDirtyProperties();
-
-            foreach (var property in Properties)
-            {
-                property.ResetDirtyProperties();
-            }
-        }
-
+        
        /// <summary>
        /// Method to call when Entity is being saved
        /// </summary>
@@ -466,6 +466,8 @@ namespace Umbraco.Core.Models

        public abstract void ChangeTrashedState(bool isTrashed, int parentId = -20);

+        #region Dirty property handling
+
        /// <summary>
        /// We will override this method to ensure that when we reset the dirty properties that we 
        /// also reset the dirty changes made to the content's Properties (user defined)
@@ -480,6 +482,89 @@ namespace Umbraco.Core.Models
                prop.ResetDirtyProperties(rememberPreviouslyChangedProperties);
            }
        }
-        
+
+        /// <summary>
+        /// Indicates whether the current entity is dirty.
+        /// </summary>
+        /// <returns>True if entity is dirty, otherwise False</returns>
+        public override bool IsDirty()
+        {
+            return IsEntityDirty() || this.IsAnyUserPropertyDirty();
+        }
+
+        /// <summary>
+        /// Indicates whether the current entity was dirty.
+        /// </summary>
+        /// <returns>True if entity was dirty, otherwise False</returns>
+        public override bool WasDirty()
+        {
+            return WasEntityDirty() || this.WasAnyUserPropertyDirty();
+        }
+
+        /// <summary>
+        /// Returns true if only the entity properties are dirty
+        /// </summary>
+        /// <returns></returns>
+        public bool IsEntityDirty()
+        {
+            return base.IsDirty();
+        }
+
+        /// <summary>
+        /// Returns true if only the entity properties were dirty
+        /// </summary>
+        /// <returns></returns>
+        public bool WasEntityDirty()
+        {
+            return base.WasDirty();
+        }
+
+        /// <summary>
+        /// Indicates whether a specific property on the current <see cref="IContent"/> entity is dirty.
+        /// </summary>
+        /// <param name="propertyName">Name of the property to check</param>
+        /// <returns>
+        /// True if any of the class properties are dirty or 
+        /// True if any of the user defined PropertyType properties are dirty based on their alias, 
+        /// otherwise False
+        /// </returns>
+        public override bool IsPropertyDirty(string propertyName)
+        {
+            bool existsInEntity = base.IsPropertyDirty(propertyName);
+            if (existsInEntity)
+                return true;
+
+            if (Properties.Contains(propertyName))
+            {
+                return Properties[propertyName].IsDirty();
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Indicates whether a specific property on the current entity was changed and the changes were committed
+        /// </summary>
+        /// <param name="propertyName">Name of the property to check</param>
+        /// <returns>
+        /// True if any of the class properties are dirty or 
+        /// True if any of the user defined PropertyType properties are dirty based on their alias, 
+        /// otherwise False
+        /// </returns>
+        public override bool WasPropertyDirty(string propertyName)
+        {
+            bool existsInEntity = base.WasPropertyDirty(propertyName);
+            if (existsInEntity)
+                return true;
+
+            if (Properties.Contains(propertyName))
+            {
+                return Properties[propertyName].WasDirty();
+            }
+
+            return false;
+        }
+
+        #endregion
    }
 }
@@ -77,10 +77,9 @@ namespace Umbraco.Core.Models
        /// </remarks>
        internal static bool RequiresSaving(this IContent entity, PublishedState publishedState)
        {
-            var dirtyEntity = (ICanBeDirty)entity;
-            var publishedChanged = dirtyEntity.IsPropertyDirty("Published") && publishedState != PublishedState.Unpublished;
+            var publishedChanged = entity.IsPropertyDirty("Published") && publishedState != PublishedState.Unpublished;
            //check if any user prop has changed
-            var propertyValueChanged = ((Content)entity).IsAnyUserPropertyDirty();
+            var propertyValueChanged = entity.IsAnyUserPropertyDirty();
            
            //We need to know if any other property apart from Published was changed here
            //don't create a new version if the published state has changed to 'Save' but no data has actually been changed
@@ -114,6 +113,25 @@ namespace Umbraco.Core.Models
            return ShouldCreateNewVersion(entity, publishedState);
        }

+        /// <summary>
+        /// Returns a list of all dirty user defined properties
+        /// </summary>
+        /// <returns></returns>
+        public static IEnumerable<string> GetDirtyUserProperties(this IContentBase entity)
+        {
+            return entity.Properties.Where(x => x.IsDirty()).Select(x => x.Alias);
+        }
+
+        public static bool IsAnyUserPropertyDirty(this IContentBase entity)
+        {
+            return entity.Properties.Any(x => x.IsDirty());
+        }
+
+        public static bool WasAnyUserPropertyDirty(this IContentBase entity)
+        {
+            return entity.Properties.Any(x => x.WasDirty());
+        }
+
        /// <summary>
        /// Determines if a new version should be created
        /// </summary>
@@ -128,15 +146,13 @@ namespace Umbraco.Core.Models
        /// </remarks>
        internal static bool ShouldCreateNewVersion(this IContent entity, PublishedState publishedState)
        {
-            var dirtyEntity = (ICanBeDirty)entity;
-
            //check if the published state has changed or the language
-            var publishedChanged = dirtyEntity.IsPropertyDirty("Published") && publishedState != PublishedState.Unpublished;
-            var langChanged = dirtyEntity.IsPropertyDirty("Language");
+            var publishedChanged = entity.IsPropertyDirty("Published") && publishedState != PublishedState.Unpublished;
+            var langChanged = entity.IsPropertyDirty("Language");
            var contentChanged = publishedChanged || langChanged;

            //check if any user prop has changed
-            var propertyValueChanged = ((Content)entity).IsAnyUserPropertyDirty();            
+            var propertyValueChanged = entity.IsAnyUserPropertyDirty();

            //return true if published or language has changed
            if (contentChanged)
@@ -78,7 +78,7 @@ namespace Umbraco.Core.Models.EntityBase
        /// Indicates that the entity had been changed and the changes were committed
        /// </summary>
        /// <returns></returns>
-        public bool WasDirty()
+        public virtual bool WasDirty()
        {
            return _lastPropertyChangedInfo != null && _lastPropertyChangedInfo.Any();
        }
@@ -137,9 +137,23 @@ namespace Umbraco.Core.Models
                new DelegateEqualityComparer<object>(
                    (o, o1) =>
                    {
-                        //Custom comparer for enumerable if it is enumerable
                        if (o == null && o1 == null) return true;
+
+                        //custom comparer for strings.                        
+                        if (o is string || o1 is string)                            
+                        {
+                            //if one is null and another is empty then they are the same
+                            if ((o as string).IsNullOrWhiteSpace() && (o1 as string).IsNullOrWhiteSpace())
+                            {
+                                return true;   
+                            }
+                            if (o == null || o1 == null) return false;
+                            return o.Equals(o1);
+                        }
+                        
                        if (o == null || o1 == null) return false;
+
+                        //Custom comparer for enumerable if it is enumerable
                        var enum1 = o as IEnumerable;
                        var enum2 = o1 as IEnumerable;
                        if (enum1 != null && enum2 != null)
@@ -112,7 +112,7 @@ namespace Umbraco.Core.ObjectResolution
 		/// <exception cref="InvalidOperationException">resolution is already frozen.</exception>
 		public static void Freeze()
 		{
-            LogHelper.Debug(typeof(Resolution), "Freezing resolution");
+            LogHelper.Debug(typeof (Resolution), "Freezing resolution");

 		    using (new WriteLock(ConfigurationLock))
 		    {
@@ -121,9 +121,20 @@ namespace Umbraco.Core.ObjectResolution

                _isFrozen = true;
            }
-			
-            if (Frozen != null)
-				Frozen(null, null);
+
+            LogHelper.Debug(typeof(Resolution), "Resolution is frozen");
+
+		    if (Frozen == null) return;
+
+		    try
+		    {
+		        Frozen(null, null);
+		    }
+		    catch (Exception e)
+		    {
+		        LogHelper.Error(typeof (Resolution), "Exception in Frozen event handler.", e);
+		        throw;
+		    }
 		}
        
        /// <summary>
@@ -34,15 +34,20 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            if (Context.CurrentDatabaseProvider == DatabaseProviders.MySql)
            {
                Delete.ForeignKey().FromTable("cmsTagRelationship").ForeignColumn("nodeId").ToTable("umbracoNode").PrimaryColumn("id");
+                //check for another strange really old one that might have existed
+                if (constraints.Any(x => x.Item1 == "cmsTagRelationship" && x.Item2 == "tagId"))
+                {
+                    Delete.ForeignKey().FromTable("cmsTagRelationship").ForeignColumn("tagId").ToTable("cmsTags").PrimaryColumn("id");
+                }
            }
            else
            {
                //Before we try to delete this constraint, we'll see if it exists first, some older schemas never had it and some older schema's had this named
                // differently than the default.

-                var constraint = constraints
-                    .SingleOrDefault(x => x.Item1 == "cmsTagRelationship" && x.Item2 == "nodeId" && x.Item3.InvariantStartsWith("PK_") == false);
-                if (constraint != null)
+                var constraintMatches = constraints.Where(x => x.Item1 == "cmsTagRelationship" && x.Item2 == "nodeId" && x.Item3.InvariantStartsWith("PK_") == false);
+
+                foreach (var constraint in constraintMatches)
                {
                    Delete.ForeignKey(constraint.Item3).OnTable("cmsTagRelationship");
                }
@@ -42,11 +42,33 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero
                Create.Index("IX_cmsDocument_newest").OnTable("cmsDocument").OnColumn("newest").Ascending().WithOptions().NonClustered();
            }

-            //TODO: We need to fix this for SQL Azure since it does not let you drop any clustered indexes
-            // Issue: http://issues.umbraco.org/issue/U4-5673
-            // Some work around notes:
-            // http://stackoverflow.com/questions/15872347/alter-clustered-index-column    
-            // https://social.msdn.microsoft.com/Forums/azure/en-US/5cc4b302-fa42-4c62-956a-bbf79dbbd040/changing-clustered-index-in-azure?forum=ssdsgetstarted
+            //We need to do this for SQL Azure V2 since it does not let you drop any clustered indexes
+            // Issue: http://issues.umbraco.org/issue/U4-5673            
+            if (Context.CurrentDatabaseProvider == DatabaseProviders.SqlServer || Context.CurrentDatabaseProvider == DatabaseProviders.SqlAzure)
+            {
+                var version = Context.Database.ExecuteScalar<string>("SELECT @@@@VERSION");
+                if (version.Contains("Microsoft SQL Azure"))
+                {
+                    var parts = version.Split(new[] { '-' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToArray();
+                    if (parts.Length > 1)
+                    {
+                        if (parts[1].StartsWith("11."))
+                        {
+
+                            //we want to drop the umbracoUserLogins_Index index since it is named incorrectly and then re-create it so 
+                            // it follows the standard naming convention
+                            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("umbracoUserLogins_Index")))
+                            {
+                                //It's the old version that doesn't support dropping a clustered index on a table, so we need to do some manual work.
+                                ExecuteSqlAzureSqlForChangingIndex();
+                            }
+
+                            return;
+                        }
+                    }   
+                }                
+            }
+           

            //we want to drop the umbracoUserLogins_Index index since it is named incorrectly and then re-create it so 
            // it follows the standard naming convention
@@ -67,5 +89,28 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero
            Delete.Index("IX_cmsDocument_published").OnTable("cmsDocument");
            Delete.Index("IX_cmsDocument_newest").OnTable("cmsDocument");
        }
+
+        private void ExecuteSqlAzureSqlForChangingIndex()
+        {
+            Context.Database.Execute(@"CREATE TABLE ""umbracoUserLogins_temp""
+(
+	contextID uniqueidentifier NOT NULL,
+	userID int NOT NULL,
+	[timeout] bigint NOT NULL
+);
+CREATE CLUSTERED INDEX ""IX_umbracoUserLogins_Index"" ON ""umbracoUserLogins_temp"" (""contextID"");
+INSERT INTO ""umbracoUserLogins_temp"" SELECT * FROM ""umbracoUserLogins""
+DROP TABLE ""umbracoUserLogins""
+CREATE TABLE ""umbracoUserLogins""
+(
+	contextID uniqueidentifier NOT NULL,
+	userID int NOT NULL,
+	[timeout] bigint NOT NULL
+);
+CREATE CLUSTERED INDEX ""IX_umbracoUserLogins_Index"" ON ""umbracoUserLogins"" (""contextID"");
+INSERT INTO ""umbracoUserLogins"" SELECT * FROM ""umbracoUserLogins_temp""
+DROP TABLE ""umbracoUserLogins_temp""");
+
+        }
    }
 }
@@ -493,15 +493,10 @@ AND umbracoNode.id <> @id",
                    throw new InvalidOperationException("Cannot insert a pre value for a data type that has no identity");
                }

-                //Cannot add a duplicate alias
-                var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataTypePreValues
-WHERE alias = @alias
-AND datatypeNodeId = @dtdid",
-                        new { alias = entity.Alias, dtdid = entity.DataType.Id });
-                if (exists > 0)
-                {
-                    throw new DuplicateNameException("A pre value with the alias " + entity.Alias + " already exists for this data type");
-                }
+                //NOTE: We used to check that the Alias was unique for the given DataTypeNodeId prevalues list, BUT
+                // in reality there is no need to check the uniqueness of this alias because the only way that this code executes is 
+                // based on an IDictionary<string, PreValue> dictionary being passed to this repository and a dictionary
+                // must have unique aliases by definition, so there is no need for this additional check

                var dto = new DataTypePreValueDto
                {
@@ -519,17 +514,12 @@ AND datatypeNodeId = @dtdid",
                {
                    throw new InvalidOperationException("Cannot update a pre value for a data type that has no identity");
                }
-
-                //Cannot change to a duplicate alias
-                var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataTypePreValues
-WHERE alias = @alias
-AND datatypeNodeId = @dtdid
-AND id <> @id",
-                        new { id = entity.Id, alias = entity.Alias, dtdid = entity.DataType.Id });
-                if (exists > 0)
-                {
-                    throw new DuplicateNameException("A pre value with the alias " + entity.Alias + " already exists for this data type");
-                }
+                
+                //NOTE: We used to check that the Alias was unique for the given DataTypeNodeId prevalues list, BUT
+                // this causes issues when sorting the pre-values (http://issues.umbraco.org/issue/U4-5670) but in reality
+                // there is no need to check the uniqueness of this alias because the only way that this code executes is 
+                // based on an IDictionary<string, PreValue> dictionary being passed to this repository and a dictionary
+                // must have unique aliases by definition, so there is no need for this additional check

                var dto = new DataTypePreValueDto
                {
@@ -606,14 +606,10 @@ namespace Umbraco.Core
        /// <returns></returns>
        internal IEnumerable<T> CreateInstances<T>(IEnumerable<Type> types, bool throwException = false)
        {
-            //Have removed logging because it doesn't really need to be logged since the time taken is generally 0ms.
-            //we want to know if it fails ever, not how long it took if it is only 0.
-
            var typesAsArray = types.ToArray();
-            //using (DisposableTimer.DebugDuration<PluginManager>(
-            //	String.Format("Starting instantiation of {0} objects of type {1}", typesAsArray.Length, typeof(T).FullName),
-            //	String.Format("Completed instantiation of {0} objects of type {1}", typesAsArray.Length, typeof(T).FullName)))
-            //{
+
+            LogHelper.Debug<PluginManager>(string.Format("Instantiating {0} objects of type {1}", typesAsArray.Length, typeof (T).FullName));
+            
            var instances = new List<T>();
            foreach (var t in typesAsArray)
            {
@@ -634,7 +630,7 @@ namespace Umbraco.Core
                }
            }
            return instances;
-            //}
+            
        }

        /// <summary>
@@ -4,6 +4,7 @@ using System.Configuration.Provider;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Web.Security;
@@ -893,5 +894,15 @@ namespace Umbraco.Core.Security
            return sb.ToString();
        }

+        /// <summary>
+        /// Returns the current request IP address for logging if there is one
+        /// </summary>
+        /// <returns></returns>
+        protected string GetCurrentRequestIpAddress()
+        {
+            var httpContext = HttpContext.Current == null ? (HttpContextBase) null : new HttpContextWrapper(HttpContext.Current);
+            return httpContext.GetCurrentRequestIpAddress();
+        }
+
    }
 }
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.Cache;
 using Umbraco.Core.CodeAnnotations;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
@@ -19,12 +20,13 @@ namespace Umbraco.Core.Services
        private readonly IMediaService _mediaService;
        private readonly IMemberService _memberService;
        private readonly IMemberTypeService _memberTypeService;
+        private readonly IRuntimeCacheProvider _runtimeCache;
        private readonly IDataTypeService _dataTypeService;
        private readonly Dictionary<string, Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>> _supportedObjectTypes;

        public EntityService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, 
            IContentService contentService, IContentTypeService contentTypeService, IMediaService mediaService, IDataTypeService dataTypeService,
-            IMemberService memberService, IMemberTypeService memberTypeService)
+            IMemberService memberService, IMemberTypeService memberTypeService, IRuntimeCacheProvider runtimeCache)
        {
            _uowProvider = provider;
            _repositoryFactory = repositoryFactory;
@@ -34,6 +36,7 @@ namespace Umbraco.Core.Services
            _dataTypeService = dataTypeService;
            _memberService = memberService;
            _memberTypeService = memberTypeService;
+            _runtimeCache = runtimeCache;

            _supportedObjectTypes = new Dictionary<string, Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>>
            {
@@ -45,6 +48,83 @@ namespace Umbraco.Core.Services
                {typeof (IMember).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.Member, _memberService.GetById)},
                {typeof (IMemberType).FullName, new Tuple<UmbracoObjectTypes, Func<int, IUmbracoEntity>>(UmbracoObjectTypes.MemberType, _memberTypeService.Get)}
            };
+
+        }
+
+        /// <summary>
+        /// Returns the integer id for a given GUID
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <returns></returns>
+        public Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType)
+        {
+            var result = _runtimeCache.GetCacheItem<int?>(CacheKeys.IdToKeyCacheKey + key, () =>
+            {
+                using (var uow = _uowProvider.GetUnitOfWork())
+                {
+                    switch (umbracoObjectType)
+                    {
+                        case UmbracoObjectTypes.Document:
+                        case UmbracoObjectTypes.MemberType:
+                        case UmbracoObjectTypes.Media:
+                        case UmbracoObjectTypes.Template:
+                        case UmbracoObjectTypes.MediaType:
+                        case UmbracoObjectTypes.DocumentType:
+                        case UmbracoObjectTypes.Member:
+                        case UmbracoObjectTypes.DataType:
+                            return uow.Database.ExecuteScalar<int?>(new Sql().Select("id").From<NodeDto>().Where<NodeDto>(dto => dto.UniqueId == key));
+                        case UmbracoObjectTypes.RecycleBin:
+                        case UmbracoObjectTypes.Stylesheet:
+                        case UmbracoObjectTypes.MemberGroup:
+                        case UmbracoObjectTypes.ContentItem:
+                        case UmbracoObjectTypes.ContentItemType:
+                        case UmbracoObjectTypes.ROOT:
+                        case UmbracoObjectTypes.Unknown:
+                        default:
+                            throw new NotSupportedException();
+                    }
+                }                
+            });
+            return result.HasValue ? Attempt.Succeed(result.Value) : Attempt<int>.Fail();
+        }
+
+        /// <summary>
+        /// Returns the GUID for a given integer id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <returns></returns>
+        public Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType)
+        {
+            var result = _runtimeCache.GetCacheItem<Guid?>(CacheKeys.KeyToIdCacheKey + id, () =>
+            {
+                using (var uow = _uowProvider.GetUnitOfWork())
+                {
+                    switch (umbracoObjectType)
+                    {
+                        case UmbracoObjectTypes.Document:
+                        case UmbracoObjectTypes.MemberType:
+                        case UmbracoObjectTypes.Media:
+                        case UmbracoObjectTypes.Template:
+                        case UmbracoObjectTypes.MediaType:
+                        case UmbracoObjectTypes.DocumentType:
+                        case UmbracoObjectTypes.Member:
+                        case UmbracoObjectTypes.DataType:
+                            return uow.Database.ExecuteScalar<Guid?>(new Sql().Select("uniqueID").From<NodeDto>().Where<NodeDto>(dto => dto.NodeId == id));
+                        case UmbracoObjectTypes.RecycleBin:
+                        case UmbracoObjectTypes.Stylesheet:
+                        case UmbracoObjectTypes.MemberGroup:
+                        case UmbracoObjectTypes.ContentItem:
+                        case UmbracoObjectTypes.ContentItemType:
+                        case UmbracoObjectTypes.ROOT:
+                        case UmbracoObjectTypes.Unknown:
+                        default:
+                            throw new NotSupportedException();
+                    }
+                }
+            });
+            return result.HasValue ? Attempt.Succeed(result.Value) : Attempt<Guid>.Fail();
        }

        public IUmbracoEntity GetByKey(Guid key, bool loadBaseType = true)
@@ -7,6 +7,21 @@ namespace Umbraco.Core.Services
 {
    public interface IEntityService
    {
+        /// <summary>
+        /// Returns the integer id for a given GUID
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <returns></returns>
+        Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Returns the GUID for a given integer id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="umbracoObjectType"></param>
+        /// <returns></returns>
+        Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType);

        /// <summary>
        /// Gets an UmbracoEntity by its Id, and optionally loads the complete object graph.
@@ -85,14 +85,14 @@ namespace Umbraco.Core.Services
                    }

                    //get the lazy value from cache                
-                    result.Add(culture, new Lazy<XDocument>(() => _cache.GetCacheItem<XDocument>(
-                        string.Format("{0}-{1}", typeof(LocalizedTextServiceFileSources).Name, culture.Name), () =>
+                    result[culture] = new Lazy<XDocument>(() => _cache.GetCacheItem<XDocument>(
+                        string.Format("{0}-{1}", typeof (LocalizedTextServiceFileSources).Name, culture.Name), () =>
                        {
                            using (var fs = localCopy.OpenRead())
                            {
                                return XDocument.Load(fs);
                            }
-                        }, isSliding: true, timeout: TimeSpan.FromMinutes(10), dependentFiles: new[] { localCopy.FullName })));
+                        }, isSliding: true, timeout: TimeSpan.FromMinutes(10), dependentFiles: new[] {localCopy.FullName}));
                }
                return result;
            });
@@ -167,7 +167,8 @@ namespace Umbraco.Core.Services
            if (_entityService == null)
                _entityService = new Lazy<IEntityService>(() => new EntityService(
                    provider, repositoryFactory.Value, 
-                    _contentService.Value, _contentTypeService.Value, _mediaService.Value, _dataTypeService.Value, _memberService.Value, _memberTypeService.Value));
+                    _contentService.Value, _contentTypeService.Value, _mediaService.Value, _dataTypeService.Value, _memberService.Value, _memberTypeService.Value,
+                    cache.RuntimeCache));

            if (_relationService == null)
                _relationService = new Lazy<IRelationService>(() => new RelationService(provider, repositoryFactory.Value, _entityService.Value));
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Events;
@@ -207,6 +208,9 @@ namespace Umbraco.Core.Services
            }
        }

+        //TODO: Remove this in 7.3, we need to track this in a db column!
+        private readonly ConcurrentDictionary<int, int> _failedLoginAttempts = new ConcurrentDictionary<int, int>();
+
        /// <summary>
        /// Get an <see cref="IUser"/> by username
        /// </summary>
@@ -217,7 +221,18 @@ namespace Umbraco.Core.Services
            using (var repository = _repositoryFactory.CreateUserRepository(_uowProvider.GetUnitOfWork()))
            {
                var query = Query<IUser>.Builder.Where(x => x.Username.Equals(username));
-                return repository.GetByQuery(query).FirstOrDefault();
+                var user = repository.GetByQuery(query).FirstOrDefault();
+
+                if (user != null)
+                {
+                    //check if they have any failed logins and merge
+                    int failedAttempts;
+                    if (_failedLoginAttempts.TryGetValue(user.Id, out failedAttempts))
+                    {
+                        user.FailedPasswordAttempts = failedAttempts;
+                    }    
+                }
+                return user;
            }
        }

@@ -284,6 +299,9 @@ namespace Umbraco.Core.Services
            }
            else
            {
+                int failedAttempts;
+                _failedLoginAttempts.TryRemove(user.Id, out failedAttempts);
+
                if (DeletingUser.IsRaisedEventCancelled(new DeleteEventArgs<IUser>(user), this))
                    return;

@@ -317,6 +335,8 @@ namespace Umbraco.Core.Services
            {
                repository.AddOrUpdate(entity);
                uow.Commit();
+
+                _failedLoginAttempts.AddOrUpdate(entity.Id, i => entity.FailedPasswordAttempts, (i, i1) => entity.FailedPasswordAttempts);
            }

            if (raiseEvents)
@@ -342,10 +362,15 @@ namespace Umbraco.Core.Services
            {
                foreach (var member in entities)
                {
-                    repository.AddOrUpdate(member);                 
+                    repository.AddOrUpdate(member);
                }
                //commit the whole lot in one go
                uow.Commit();
+                foreach (var member in entities)
+                {
+                    _failedLoginAttempts.AddOrUpdate(member.Id, i => member.FailedPasswordAttempts, (i, i1) => member.FailedPasswordAttempts);
+                }
+                
            }

            if (raiseEvents)
@@ -15,6 +15,7 @@ using Umbraco.Core.Configuration;
 using System.Web.Security;
 using Umbraco.Core.Strings;
 using Umbraco.Core.CodeAnnotations;
+using Umbraco.Core.IO;

 namespace Umbraco.Core
 {
@@ -59,6 +60,50 @@ namespace Umbraco.Core

        }

+        /// <summary>
+        /// Based on the input string, this will detect if the strnig is a JS path or a JS snippet.
+        /// If a path cannot be determined, then it is assumed to be a snippet the original text is returned
+        /// with an invalid attempt, otherwise a valid attempt is returned with the resolved path
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is only used for legacy purposes for the Action.JsSource stuff and shouldn't be needed in v8
+        /// </remarks>
+        internal static Attempt<string> DetectIsJavaScriptPath(this string input)
+        {
+            //validate that this is a url, if it is not, we'll assume that it is a text block and render it as a text
+            //block instead.
+            var isValid = true;
+
+            if (Uri.IsWellFormedUriString(input, UriKind.RelativeOrAbsolute))
+            {
+                //ok it validates, but so does alert('hello'); ! so we need to do more checks
+
+                //here are the valid chars in a url without escaping
+                if (Regex.IsMatch(input, @"[^a-zA-Z0-9-._~:/?#\[\]@!$&'\(\)*\+,%;=]"))
+                    isValid = false;
+
+                //we'll have to be smarter and just check for certain js patterns now too!
+                var jsPatterns = new[] { @"\+\s*\=", @"\);", @"function\s*\(", @"!=", @"==" };
+                if (jsPatterns.Any(p => Regex.IsMatch(input, p)))
+                    isValid = false;
+
+                if (isValid)
+                {
+                    var resolvedUrlResult = IOHelper.TryResolveUrl(input);
+                    //if the resolution was success, return it, otherwise just return the path, we've detected
+                    // it's a path but maybe it's relative and resolution has failed, etc... in which case we're just
+                    // returning what was given to us.
+                    return resolvedUrlResult.Success 
+                        ? resolvedUrlResult 
+                        : Attempt.Succeed(input);
+                }
+            }
+
+            return Attempt.Fail(input);
+        }
+
        /// <summary>
        /// This tries to detect a json string, this is not a fail safe way but it is quicker than doing 
        /// a try/catch when deserializing when it is not json.
@@ -1,10 +1,9 @@
-using System;
 using System.Linq;
 using System.Web;
-using System.Xml;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;

 namespace Umbraco.Core.Sync
 {
@@ -13,58 +12,73 @@ namespace Umbraco.Core.Sync
    /// </summary>
    internal static class ServerEnvironmentHelper
    {
-        /// <summary>
-        /// Returns the current umbraco base url for the current server depending on it's environment 
-        /// status. This will attempt to determine the internal umbraco base url that can be used by the current
-        /// server to send a request to itself if it is in a load balanced environment.
-        /// </summary>
-        /// <returns>The full base url including schema (i.e. http://myserver:80/umbraco ) - or <c>null</c> if the url
-        /// cannot be determined at the moment (usually because the first request has not properly completed yet).</returns>
-        public static string GetCurrentServerUmbracoBaseUrl(ApplicationContext appContext, IUmbracoSettingsSection settings)
+        public static void TrySetApplicationUrlFromSettings(ApplicationContext appContext, IUmbracoSettingsSection settings)
        {
+            // try umbracoSettings:settings/web.routing/@umbracoApplicationUrl
+            // which is assumed to:
+            // - end with SystemDirectories.Umbraco
+            // - contain a scheme
+            // - end or not with a slash, it will be taken care of
+            // eg "http://www.mysite.com/umbraco"
+            var url = settings.WebRouting.UmbracoApplicationUrl;
+            if (url.IsNullOrWhiteSpace() == false)
+            {
+                appContext.UmbracoApplicationUrl = url.TrimEnd('/');
+                LogHelper.Info(typeof(ServerEnvironmentHelper), "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (using web.routing/@umbracoApplicationUrl)");
+                return;
+            }
+
+            // try umbracoSettings:settings/scheduledTasks/@baseUrl
+            // which is assumed to:
+            // - end with SystemDirectories.Umbraco
+            // - NOT contain any scheme (because, legacy)
+            // - end or not with a slash, it will be taken care of
+            // eg "mysite.com/umbraco"
+            url = settings.ScheduledTasks.BaseUrl;
+            if (url.IsNullOrWhiteSpace() == false)
+            {
+                var ssl = GlobalSettings.UseSSL ? "s" : "";
+                url = "http" + ssl + "://" + url;
+                appContext.UmbracoApplicationUrl = url.TrimEnd('/');
+                LogHelper.Info(typeof(ServerEnvironmentHelper), "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (using scheduledTasks/@baseUrl)");
+                return;
+            }
+
+            // try servers
            var status = GetStatus(settings);
-
            if (status == CurrentServerEnvironmentStatus.Single)
-            {
-                // single install, return null if no config/original url, else use config/original url as base
-                // use http or https as appropriate
-                return GetBaseUrl(appContext, settings);
-            }
+                return;

+            // no server, nothing we can do
            var servers = settings.DistributedCall.Servers.ToArray();
+            if (servers.Length == 0)
+                return;

-            if (servers.Any() == false)
-            {
-                // cannot be determined, return null if no config/original url, else use config/original url as base
-                // use http or https as appropriate
-                return GetBaseUrl(appContext, settings);
-            }
-
+            // we have servers, look for this server
            foreach (var server in servers)
            {
                var appId = server.AppId;
                var serverName = server.ServerName;

+                // skip if no data
                if (appId.IsNullOrWhiteSpace() && serverName.IsNullOrWhiteSpace())
-                {
                    continue;
-                }

+                // if this server, build and return the url
                if ((appId.IsNullOrWhiteSpace() == false && appId.Trim().InvariantEquals(HttpRuntime.AppDomainAppId))
                    || (serverName.IsNullOrWhiteSpace() == false && serverName.Trim().InvariantEquals(NetworkHelper.MachineName)))
                {
-                    //match by appId or computer name! return the url configured
-                    return string.Format("{0}://{1}:{2}/{3}",
+                    // match by appId or computer name, return the url configured
+                    url = string.Format("{0}://{1}:{2}/{3}",
                        server.ForceProtocol.IsNullOrWhiteSpace() ? "http" : server.ForceProtocol,
                        server.ServerAddress,
                        server.ForcePortnumber.IsNullOrWhiteSpace() ? "80" : server.ForcePortnumber,
                        IOHelper.ResolveUrl(SystemDirectories.Umbraco).TrimStart('/'));
+
+                    appContext.UmbracoApplicationUrl = url.TrimEnd('/');
+                    LogHelper.Info(typeof(ServerEnvironmentHelper), "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (using distributedCall/servers)");
                }
            }
-
-            // cannot be determined, return null if no config/original url, else use config/original url as base
-            // use http or https as appropriate
-            return GetBaseUrl(appContext, settings);
        }

        /// <summary>
@@ -113,21 +127,5 @@ namespace Umbraco.Core.Sync

            return CurrentServerEnvironmentStatus.Slave;
        }
-
-        private static string GetBaseUrl(ApplicationContext appContext, IUmbracoSettingsSection settings)
-        {
-            return (
-                // is config empty?
-                settings.ScheduledTasks.BaseUrl.IsNullOrWhiteSpace()
-                    // is the orig req empty?
-                    ? appContext.OriginalRequestUrl.IsNullOrWhiteSpace()
-                        // we've got nothing
-                        ? null
-                        //the orig req url is not null, use that
-                        : string.Format("http{0}://{1}", GlobalSettings.UseSSL ? "s" : "", appContext.OriginalRequestUrl)
-                    // the config has been specified, use that
-                    : string.Format("http{0}://{1}", GlobalSettings.UseSSL ? "s" : "", settings.ScheduledTasks.BaseUrl))
-                .EnsureEndsWith('/');
-        }
    }
 }
@@ -137,7 +137,7 @@ namespace Umbraco.Core
                }

                return _allAssemblies;
-            }            
+            }
        }

        /// <summary>
@@ -226,7 +226,7 @@ namespace Umbraco.Core
                }

                return LocalFilteredAssemblyCache;
-            }            
+            }
        }

        /// <summary>
@@ -451,7 +451,7 @@ namespace Umbraco.Core
                var allTypes = GetTypesWithFormattedException(a)
                    .ToArray();

-                var attributedTypes = new Type[] {};
+                var attributedTypes = new Type[] { };
                try
                {
                    //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes but have
@@ -480,7 +480,8 @@ namespace Umbraco.Core

                //now we need to include types that may be inheriting from sub classes of the attribute type being searched for
                //so we will search in assemblies that reference those types too.
-                foreach (var subTypesInAssembly in allAttributeTypes.GroupBy(x => x.Assembly)){
+                foreach (var subTypesInAssembly in allAttributeTypes.GroupBy(x => x.Assembly))
+                {

                    //So that we are not scanning too much, we need to group the sub types:    
                    // * if there is more than 1 sub type in the same assembly then we should only search on the 'lowest base' type.
@@ -610,7 +611,7 @@ namespace Umbraco.Core
                catch (TypeLoadException ex)
                {
                    LogHelper.Error(typeof(TypeFinder), string.Format("Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", a), ex);
-                    continue; 
+                    continue;
                }

                //add the types to our list to return
@@ -618,7 +619,7 @@ namespace Umbraco.Core
                {
                    foundAssignableTypes.Add(t);
                }
-                
+
                //now we need to include types that may be inheriting from sub classes of the type being searched for
                //so we will search in assemblies that reference those types too.
                foreach (var subTypesInAssembly in allSubTypes.GroupBy(x => x.Assembly))
@@ -699,7 +700,18 @@ namespace Umbraco.Core

        #endregion

-
+        //TODO: This isn't very elegant, and will have issues since the AppDomain.CurrentDomain
+        // doesn't actualy load in all assemblies, only the types that have been referenced so far.
+        // However, in a web context, the BuildManager will have executed which will force all assemblies
+        // to be loaded so it's fine for now.
+        internal static Type GetTypeByName(string typeName)
+        {
+            var type = Type.GetType(typeName);
+            if (type != null) return type;
+            return AppDomain.CurrentDomain.GetAssemblies()
+                .Select(x => x.GetType(typeName))
+                .FirstOrDefault(x => x != null);
+        }

    }
 }
@@ -64,7 +64,7 @@
    </Reference>
    <Reference Include="MySql.Data">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+      <HintPath>..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -312,9 +312,12 @@
    <Compile Include="Events\SaveEventArgs.cs" />
    <Compile Include="Events\SendToPublishEventArgs.cs" />
    <Compile Include="Exceptions\InvalidCompositionException.cs" />
+    <Compile Include="Exceptions\UmbracoStartupFailedException.cs" />
    <Compile Include="HideFromTypeFinderAttribute.cs" />
+    <Compile Include="HttpContextExtensions.cs" />
    <Compile Include="IApplicationEventHandler.cs" />
    <Compile Include="IDisposeOnRequestEnd.cs" />
+    <Compile Include="MainDom.cs" />
    <Compile Include="Manifest\GridEditorConverter.cs" />
    <Compile Include="Media\Exif\BitConverterEx.cs" />
    <Compile Include="Media\Exif\ExifBitConverter.cs" />
@@ -1213,9 +1216,11 @@
    <Compile Include="UriExtensions.cs" />
    <Compile Include="SystemUtilities.cs" />
    <Compile Include="UrlHelperExtensions.cs" />
+    <Compile Include="WaitHandleExtensions.cs" />
    <Compile Include="WriteLock.cs" />
    <Compile Include="XmlExtensions.cs" />
    <Compile Include="XmlHelper.cs" />
+    <Compile Include="Xml\UmbracoXPathPathSyntaxParser.cs" />
    <Compile Include="Xml\XPath\MacroNavigator.cs" />
    <Compile Include="Xml\XPath\INavigableContentType.cs" />
    <Compile Include="Xml\XPath\NavigableNavigator.cs" />
@@ -36,6 +36,19 @@ namespace Umbraco.Core
            //don't output the MVC version header (security)
            MvcHandler.DisableMvcResponseHeader = true;

+            //take care of unhandled exceptions - there is nothing we can do to 
+            // prevent the entire w3wp process to go down but at least we can try
+            // and log the exception
+            AppDomain.CurrentDomain.UnhandledException += (_, args) =>
+            {
+                var exception = (Exception) args.ExceptionObject;
+                var isTerminating = args.IsTerminating; // always true?
+
+                var msg = "Unhandled exception in AppDomain";
+                if (isTerminating) msg += " (terminating)";
+                LogHelper.Error<UmbracoApplicationBase>(msg, exception);
+            };
+
            //boot up the application
            GetBootManager()
                .Initialize()
@@ -73,7 +86,18 @@ namespace Umbraco.Core
        protected virtual void OnApplicationStarting(object sender, EventArgs e)
        {
            if (ApplicationStarting != null)
-                ApplicationStarting(sender, e);
+            {
+                try
+                {
+                    ApplicationStarting(sender, e);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<UmbracoApplicationBase>("An error occurred in an ApplicationStarting event handler", ex);
+                    throw;
+                }
+            }
+                
        }

        /// <summary>
@@ -84,7 +108,17 @@ namespace Umbraco.Core
        protected virtual void OnApplicationStarted(object sender, EventArgs e)
        {
            if (ApplicationStarted != null)
-                ApplicationStarted(sender, e);
+            {
+                try
+                {
+                    ApplicationStarted(sender, e);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<UmbracoApplicationBase>("An error occurred in an ApplicationStarted event handler", ex);
+                    throw;
+                }
+            }
        }

        /// <summary>
@@ -95,7 +129,17 @@ namespace Umbraco.Core
        private void OnApplicationInit(object sender, EventArgs e)
        {
            if (ApplicationInit != null)
-                ApplicationInit(sender, e);
+            {
+                try
+                {
+                    ApplicationInit(sender, e);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<UmbracoApplicationBase>("An error occurred in an ApplicationInit event handler", ex);
+                    throw;
+                }
+            }
        }

        /// <summary>
@@ -49,7 +49,7 @@ namespace Umbraco.Core
            var urlPath = fullUrlPath.TrimStart(appPath).EnsureStartsWith('/');
            
            //check if this is in the umbraco back office
-            var isUmbracoPath = urlPath.InvariantStartsWith(GlobalSettings.Path.EnsureStartsWith('/'));
+            var isUmbracoPath = urlPath.InvariantStartsWith(GlobalSettings.Path.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
            //if not, then def not back office
            if (isUmbracoPath == false) return false;

@@ -0,0 +1,44 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core
+{
+    internal static class WaitHandleExtensions
+    {
+
+        // http://stackoverflow.com/questions/25382583/waiting-on-a-named-semaphore-with-waitone100-vs-waitone0-task-delay100
+        // http://blog.nerdbank.net/2011/07/c-await-for-waithandle.html
+        // F# has a AwaitWaitHandle method that accepts a time out... and seems pretty complex...
+        // version below should be OK
+
+        public static Task WaitOneAsync(this WaitHandle handle, int millisecondsTimeout = Timeout.Infinite)
+        {
+            var tcs = new TaskCompletionSource<object>();
+            var callbackHandleInitLock = new object();
+            lock (callbackHandleInitLock)
+            {
+                RegisteredWaitHandle callbackHandle = null;
+                // ReSharper disable once RedundantAssignment
+                callbackHandle = ThreadPool.RegisterWaitForSingleObject(
+                    handle,
+                    (state, timedOut) =>
+                    {
+                        tcs.SetResult(null);
+
+                        // we take a lock here to make sure the outer method has completed setting the local variable callbackHandle.
+                        lock (callbackHandleInitLock)
+                        {
+                            // ReSharper disable once PossibleNullReferenceException
+                            // ReSharper disable once AccessToModifiedClosure
+                            callbackHandle.Unregister(null);
+                        }
+                    },
+                    /*state:*/ null,
+                    /*millisecondsTimeOutInterval:*/ millisecondsTimeout,
+                    /*executeOnlyOnce:*/ true);
+            }
+
+            return tcs.Task;
+        }
+    }
+}
@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Xml
+{
+    /// <summary>
+    /// This is used to parse our customize Umbraco XPath expressions (i.e. that include special tokens like $site) into 
+    /// a real XPath statement
+    /// </summary>
+    internal class UmbracoXPathPathSyntaxParser
+    {
+        /// <summary>
+        /// Parses custom umbraco xpath expression
+        /// </summary>
+        /// <param name="xpathExpression">The Xpath expression</param>
+        /// <param name="nodeContextId">
+        /// The current node id context of executing the query - null if there is no current node, in which case
+        /// some of the parameters like $current, $parent, $site will be disabled
+        /// </param>
+        /// <param name="getPath">The callback to create the nodeId path, given a node Id</param>
+        /// <param name="publishedContentExists">The callback to return whether a published node exists based on Id</param>
+        /// <returns></returns>
+        public static string ParseXPathQuery(
+            string xpathExpression, 
+            int? nodeContextId, 
+            Func<int, IEnumerable<string>> getPath,
+            Func<int, bool> publishedContentExists)
+        {
+
+            //TODO: This should probably support some of the old syntax and token replacements, currently 
+            // it does not, there is a ticket raised here about it: http://issues.umbraco.org/issue/U4-6364
+            // previous tokens were: "$currentPage", "$ancestorOrSelf", "$parentPage" and I beleive they were 
+            // allowed 'inline', not just at the beginning... whether or not we want to support that is up 
+            // for discussion.
+
+            Mandate.ParameterNotNullOrEmpty(xpathExpression, "xpathExpression");
+            Mandate.ParameterNotNull(getPath, "getPath");
+            Mandate.ParameterNotNull(publishedContentExists, "publishedContentExists");
+
+            //no need to parse it
+            if (xpathExpression.StartsWith("$") == false)
+                return xpathExpression;
+
+            //get nearest published item
+            Func<IEnumerable<string>, int> getClosestPublishedAncestor = (path =>
+            {
+                foreach (var i in path)
+                {
+                    int idAsInt;
+                    if (int.TryParse(i, out idAsInt))
+                    {
+                        var exists = publishedContentExists(int.Parse(i));
+                        if (exists)
+                            return idAsInt;
+                    }
+                }
+                return -1;
+            });
+
+            const string rootXpath = "descendant::*[@id={0}]";
+
+            //parseable items:
+            var vars = new Dictionary<string, Func<string, string>>();
+
+            //These parameters must have a node id context
+            if (nodeContextId.HasValue)
+            {
+                vars.Add("$current", q =>
+                {
+                    var closestPublishedAncestorId = getClosestPublishedAncestor(getPath(nodeContextId.Value));
+                    return q.Replace("$current", string.Format(rootXpath, closestPublishedAncestorId));
+                });
+
+                vars.Add("$parent", q =>
+                {
+                    //remove the first item in the array if its the current node
+                    //this happens when current is published, but we are looking for its parent specifically
+                    var path = getPath(nodeContextId.Value).ToArray();
+                    if (path[0] == nodeContextId.ToString())
+                    {
+                        path = path.Skip(1).ToArray();
+                    }
+
+                    var closestPublishedAncestorId = getClosestPublishedAncestor(path);
+                    return q.Replace("$parent", string.Format(rootXpath, closestPublishedAncestorId));
+                });
+
+
+                vars.Add("$site", q =>
+                {
+                    var closestPublishedAncestorId = getClosestPublishedAncestor(getPath(nodeContextId.Value));
+                    return q.Replace("$site", string.Format(rootXpath, closestPublishedAncestorId) + "/ancestor-or-self::*[@level = 1]");
+                });
+            }
+
+            //TODO: This used to just replace $root with string.Empty BUT, that would never work
+            // the root is always "/root . Need to confirm with Per why this was string.Empty before!
+            vars.Add("$root", q => q.Replace("$root", "/root"));
+
+
+            foreach (var varible in vars)
+            {
+                if (xpathExpression.StartsWith(varible.Key))
+                {
+                    xpathExpression = varible.Value(xpathExpression);
+                    break;
+                }
+            }
+
+            return xpathExpression;
+        }
+
+    }
+}
@@ -2,18 +2,18 @@
 <packages>
  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
-  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
+  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net4" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net4" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net4" />
  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net4" />
  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
  <package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net4" />
  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.6.5" targetFramework="net40" />
+  <package id="MySql.Data" version="6.9.7" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
-  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net4" />
+  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net4" />
 </packages>
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Web.UI;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
@@ -21,6 +22,83 @@ namespace Umbraco.Tests.Cache
        public virtual void TearDown()
        {
            Provider.ClearAllCache();
+        } 
+
+        [Test]
+        public void Throws_On_Reentry()
+        {
+            // don't run for StaticCacheProvider - not making sense
+            if (GetType() == typeof (StaticCacheProviderTests))
+                Assert.Ignore("Do not run for StaticCacheProvider.");
+
+            Exception exception = null;
+            var result = Provider.GetCacheItem("blah", () =>
+            {
+                try
+                {
+                    var result2 = Provider.GetCacheItem("blah");
+                }
+                catch (Exception e)
+                {
+                    exception = e;
+                }
+                return "value";
+            });
+            Assert.IsNotNull(exception);
+            Assert.IsAssignableFrom<InvalidOperationException>(exception);
+        }
+
+        [Test]
+        public void Does_Not_Cache_Exceptions()
+        {
+            var counter = 0;
+
+            object result;
+            try
+            {
+                result = Provider.GetCacheItem("Blah", () =>
+                    {
+                        counter++;
+                        throw new Exception("Do not cache this");
+                    });
+            }
+            catch (Exception){}
+
+            try
+            {
+                result = Provider.GetCacheItem("Blah", () =>
+                {
+                    counter++;
+                    throw new Exception("Do not cache this");
+                });
+            }
+            catch (Exception){}
+
+            Assert.Greater(counter, 1);
+
+        }
+
+        [Test]
+        public void Ensures_Delegate_Result_Is_Cached_Once()
+        {
+            var counter = 0;
+
+            object result;
+            
+            result = Provider.GetCacheItem("Blah", () =>
+            {
+                counter++;
+                return "";
+            });
+
+            result = Provider.GetCacheItem("Blah", () =>
+            {
+                counter++;
+                return "";
+            });
+
+            Assert.AreEqual(counter, 1);
+
        }

        [Test]
@@ -1,4 +1,5 @@
-using System.Web;
+using System;
+using System.Web;
 using NUnit.Framework;
 using Umbraco.Core.Cache;

@@ -29,5 +30,29 @@ namespace Umbraco.Tests.Cache
        {
            get { return _provider; }
        }
+
+        [Test]
+        public void DoesNotCacheExceptions()
+        {
+            string value;
+            Assert.Throws<Exception>(() => { value = (string)_provider.GetCacheItem("key", () => GetValue(1)); });
+            Assert.Throws<Exception>(() => { value = (string)_provider.GetCacheItem("key", () => GetValue(2)); });
+
+            // does not throw
+            value = (string)_provider.GetCacheItem("key", () => GetValue(3));
+            Assert.AreEqual("succ3", value);
+
+            // cache
+            value = (string)_provider.GetCacheItem("key", () => GetValue(4));
+            Assert.AreEqual("succ3", value);
+        }
+
+        private static string GetValue(int i)
+        {
+            Console.WriteLine("get" + i);
+            if (i < 3)
+                throw new Exception("fail");
+            return "succ" + i;
+        }
    }
 }
@@ -28,10 +28,16 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
            Assert.IsTrue(SettingsSection.Content.Error404Collection.Count() == 3);
            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(0).Culture == "default");
            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(0).ContentId == 1047);
+            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(0).HasContentId);
+            Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(0).HasContentKey);
            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(1).Culture == "en-US");
-            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(1).ContentId == 1048);
+            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(1).ContentXPath == "$site/error [@name = 'error']");
+            Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(1).HasContentId);
+            Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(1).HasContentKey);
            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(2).Culture == "en-UK");
-            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(2).ContentId == 1049);
+            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(2).ContentKey == new Guid("8560867F-B88F-4C74-A9A4-679D8E5B3BFC"));
+            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(2).HasContentKey);
+            Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(2).HasContentId);
        }    

        [Test]
@@ -42,8 +42,8 @@
            </error404>-->
      <error404>
        <errorPage culture="default">1047</errorPage>
-        <errorPage culture="en-US">1048</errorPage>
-        <errorPage culture="en-UK">1049</errorPage>
+        <errorPage culture="en-US">$site/error [@name = 'error']</errorPage>
+        <errorPage culture="en-UK">8560867F-B88F-4C74-A9A4-679D8E5B3BFC</errorPage>
      </error404>
      <!--<error404>1</error404>-->
    </errors>
@@ -0,0 +1,41 @@
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Web.Editors;
+
+namespace Umbraco.Tests.Controllers
+{
+    [TestFixture]
+    public class BackOfficeControllerUnitTests
+    {
+        public static object[] TestLegacyJsActionPaths = new object[] {
+            new string[]
+            {
+                "alert('hello');",
+                "function test() { window.location = 'http://www.google.com'; }",
+                "function openCourierSecurity(userid){ UmbClientMgr.contentFrame('page?userid=123); }",
+                @"function openRepository(repo, folder){ UmbClientMgr.contentFrame('page?repo=repo&folder=folder); }
+                  function openTransfer(revision, repo, folder){ UmbClientMgr.contentFrame('page?revision=revision&repo=repo&folder=folder); }",
+                "umbraco/js/test.js",
+                "/umbraco/js/test.js",
+                "~/umbraco/js/test.js"
+            }
+        };
+
+
+        [TestCaseSource("TestLegacyJsActionPaths")]
+        public void Separates_Legacy_JsActions_By_Block_Or_Url(object[] jsActions)
+        {
+            var jsBlocks =
+                BackOfficeController.GetLegacyActionJsForActions(BackOfficeController.LegacyJsActionType.JsBlock,
+                    jsActions.Select(n => n.ToString()));
+
+            var jsUrls =
+                BackOfficeController.GetLegacyActionJsForActions(BackOfficeController.LegacyJsActionType.JsUrl,
+                    jsActions.Select(n => n.ToString()));
+
+            Assert.That(jsBlocks.Count() == 4);
+            Assert.That(jsUrls.Count() == 3);
+            Assert.That(jsUrls.Last().StartsWith("~/") == false);
+        }
+    }
+}
@@ -24,6 +24,19 @@ namespace Umbraco.Tests.CoreStrings
            ShortStringHelperResolver.Reset();
        }

+        [TestCase("alert('hello');", false)]
+        [TestCase("~/Test.js", true)]
+        [TestCase("../Test.js", true)]
+        [TestCase("/Test.js", true)]
+        [TestCase("Test.js", true)]
+        [TestCase("Test.js==", false)]
+        [TestCase("/Test.js function(){return true;}", false)]
+        public void Detect_Is_JavaScript_Path(string input, bool result)
+        {
+            var output = input.DetectIsJavaScriptPath();
+            Assert.AreEqual(result, output.Success);
+        }
+
        [TestCase("hello.txt", "hello")]
        [TestCase("this.is.a.Txt", "this.is.a")]
        [TestCase("this.is.not.a. Txt", "this.is.not.a. Txt")]
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 using Umbraco.Core.IO;

 namespace Umbraco.Tests.IO
@@ -13,11 +14,20 @@ namespace Umbraco.Tests.IO
    public class IOHelperTest
    {

-		[Test]
-		public void IOHelper_ResolveUrl()
+        [TestCase("~/Scripts", "/Scripts", null)]
+        [TestCase("/Scripts", "/Scripts", null)]
+        [TestCase("../Scripts", "/Scripts", typeof(ArgumentException))]
+		public void IOHelper_ResolveUrl(string input, string expected, Type expectedExceptionType)
 		{
-			var result = IOHelper.ResolveUrl("~/Scripts");
-			Assert.AreEqual("/Scripts", result);
+            if (expectedExceptionType != null)
+            {
+                Assert.Throws(expectedExceptionType, () => IOHelper.ResolveUrl(input));
+            }
+            else
+            {
+                var result = IOHelper.ResolveUrl(input);
+                Assert.AreEqual(expected, result);                
+            }
 		}

        /// <summary>
@@ -109,6 +109,120 @@ namespace Umbraco.Tests.Macros
 <p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
        }

+        [Test]
+        public void Format_RTE_Data_For_Editor_With_Params_When_MacroAlias_Not_First()
+        {
+            var content = @"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" />
+<p>asdfasdf</p>";
+            var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+
+//            Assert.AreEqual(@"<p>asdfasdf</p>
+//<p>asdfsadf</p>
+//<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+//<!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
+//<ins>Macro alias: <strong>Map</strong></ins></div>
+//<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+            Assert.AreEqual(@"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
+<!-- <?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" /> -->
+<ins>Macro alias: <strong>Map</strong></ins></div>
+<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+        }
+
+        [Test]
+        public void Format_RTE_Data_For_Editor_With_Params_When_MacroAlias_Is_First()
+        {
+
+            var content = @"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" />
+<p>asdfasdf</p>";
+            var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+
+            //            Assert.AreEqual(@"<p>asdfasdf</p>
+            //<p>asdfsadf</p>
+            //<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+            //<!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
+            //<ins>Macro alias: <strong>Map</strong></ins></div>
+            //<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+            Assert.AreEqual(@"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
+<!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
+<ins>Macro alias: <strong>Map</strong></ins></div>
+<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+        }
+
+        [Test]
+        public void Format_RTE_Data_For_Editor_With_Params_When_Multiple_Macros()
+        {
+            var content = @"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" />
+<p>asdfsadf</p>
+<?UMBRACO_MACRO test1=""value1"" macroAlias=""Map"" test2=""value2"" />
+<p>asdfsadf</p>
+<?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" />
+<p>asdfasdf</p>";
+            var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+
+            //            Assert.AreEqual(@"<p>asdfasdf</p>
+            //<p>asdfsadf</p>
+            //<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+            //<!-- <?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" /> -->
+            //<ins>Macro alias: <strong>Map</strong></ins></div>
+            //<p>asdfsadf</p>
+            //<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+            //<!-- <?UMBRACO_MACRO test1=""value1"" macroAlias=""Map"" test2=""value2"" /> -->
+            //<ins>Macro alias: <strong>Map</strong></ins></div>
+            //<p>asdfsadf</p>
+            //<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+            //<!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
+            //<ins>Macro alias: <strong>Map</strong></ins></div>
+            //<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+
+            Assert.AreEqual(@"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
+<!-- <?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" /> -->
+<ins>Macro alias: <strong>Map</strong></ins></div>
+<p>asdfsadf</p>
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
+<!-- <?UMBRACO_MACRO test1=""value1"" macroAlias=""Map"" test2=""value2"" /> -->
+<ins>Macro alias: <strong>Map</strong></ins></div>
+<p>asdfsadf</p>
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
+<!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
+<ins>Macro alias: <strong>Map</strong></ins></div>
+<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+        }
+
+        [Test]
+        public void Format_RTE_Data_For_Editor_With_Multiple_Macros()
+        {
+            var content = @"<p>asdfasdf</p>
+<?UMBRACO_MACRO macroAlias=""Breadcrumb"" />
+<p>asdfsadf</p>
+<p> </p>
+<?UMBRACO_MACRO macroAlias=""login"" />
+<p> </p>";
+            var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>());
+
+            Assert.AreEqual(@"<p>asdfasdf</p>
+<div class=""umb-macro-holder mceNonEditable"">
+<!-- <?UMBRACO_MACRO macroAlias=""Breadcrumb"" /> -->
+<ins>Macro alias: <strong>Breadcrumb</strong></ins></div>
+<p>asdfsadf</p>
+<p> </p>
+<div class=""umb-macro-holder mceNonEditable"">
+<!-- <?UMBRACO_MACRO macroAlias=""login"" /> -->
+<ins>Macro alias: <strong>login</strong></ins></div>
+<p> </p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+        }
+
        [Test]
        public void Format_RTE_Data_For_Editor_With_Params_Closing_Tag()
        {
@@ -701,6 +701,37 @@ namespace Umbraco.Tests.Models
            Assert.That(contentType.WasPropertyDirty("Alias"), Is.True);
        }

+        [Test]
+        public void After_Committing_Changes_Was_Dirty_Is_True_On_Changed_Property()
+        {
+            // Arrange
+            var contentType = MockedContentTypes.CreateTextpageContentType();
+            contentType.ResetDirtyProperties(); //reset
+            var content = MockedContent.CreateTextpageContent(contentType, "test", -1);
+            content.ResetDirtyProperties();
+
+            // Act
+            content.SetPropertyValue("title", "new title");
+            Assert.That(content.IsEntityDirty(), Is.False);
+            Assert.That(content.IsDirty(), Is.True);
+            Assert.That(content.IsPropertyDirty("title"), Is.True);
+            Assert.That(content.IsAnyUserPropertyDirty(), Is.True);
+            Assert.That(content.GetDirtyUserProperties().Count(), Is.EqualTo(1));
+            Assert.That(content.Properties[0].IsDirty(), Is.True);
+            Assert.That(content.Properties["title"].IsDirty(), Is.True);
+            
+            content.ResetDirtyProperties(); //this would be like committing the entity
+
+            // Assert
+            Assert.That(content.WasDirty(), Is.True);
+            Assert.That(content.Properties[0].WasDirty(), Is.True);
+
+
+            Assert.That(content.WasPropertyDirty("title"), Is.True);
+            Assert.That(content.Properties["title"].IsDirty(), Is.False);
+            Assert.That(content.Properties["title"].WasDirty(), Is.True);
+        }
+
        [Test]
        public void If_Not_Committed_Was_Dirty_Is_False()
        {
@@ -21,17 +21,29 @@ namespace Umbraco.Tests.Scheduling
            TestHelper.SetupLog4NetForTests();
        }

+        /*
        [Test]
        public async void ShutdownWaitWhenRunning()
        {
-            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { AutoStart = true, KeepAlive = true }))
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions
            {
-                Assert.IsTrue(runner.IsRunning);
-                Thread.Sleep(800); // for long
-                Assert.IsTrue(runner.IsRunning);
+                AutoStart = true,
+                KeepAlive = true
+            }))
+            {
+                var stopped = false;
+                runner.Stopped += (sender, args) => { stopped = true; };
+
+                Assert.IsTrue(runner.IsRunning); // because AutoStart is true
+                Thread.Sleep(500); // and because KeepAlive is true...
+                Assert.IsTrue(runner.IsRunning); // ...it keeps running
+
                runner.Shutdown(false, true); // -force +wait
-                await runner; // wait for the entire runner operation to complete
-                Assert.IsTrue(runner.IsCompleted);
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+
+                Assert.IsTrue(runner.IsCompleted); // shutdown completes the runner
+                Assert.IsFalse(runner.IsRunning); // no more running tasks
+                Assert.IsTrue(stopped);
            }
        }

@@ -44,38 +56,121 @@ namespace Umbraco.Tests.Scheduling

                runner.TaskStarting += (sender, args) => Console.WriteLine("starting {0}", DateTime.Now);
                runner.TaskCompleted += (sender, args) => Console.WriteLine("completed {0}", DateTime.Now);
+                runner.Stopped += (sender, args) => Console.WriteLine("stopped {0}", DateTime.Now);

-                Assert.IsFalse(runner.IsRunning);
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false

                Console.WriteLine("Adding task {0}", DateTime.Now);
                runner.Add(new MyTask(5000));
+                Thread.Sleep(500);
                Assert.IsTrue(runner.IsRunning); // is running the task
+
                Console.WriteLine("Shutting down {0}", DateTime.Now);
                runner.Shutdown(false, false); // -force -wait
-                Assert.IsTrue(runner.IsCompleted);
+
+                Assert.IsTrue(runner.IsCompleted); // shutdown completes the runner
                Assert.IsTrue(runner.IsRunning); // still running that task
                Thread.Sleep(3000);              // wait slightly less than the task takes to complete
                Assert.IsTrue(runner.IsRunning); // still running that task

-                await runner; // wait for the entire runner operation to complete
-                
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+
                Console.WriteLine("End {0}", DateTime.Now);
            }
        }
+        */
+
+        [Test]
+        public async void ShutdownWhenRunningWithWait()
+        {
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
+            {
+                var stopped = false;
+                runner.Stopped += (sender, args) => { stopped = true; };
+
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false
+                runner.Add(new MyTask(5000));
+                Assert.IsTrue(runner.IsRunning); // is running the task
+
+                runner.Shutdown(false, true); // -force +wait
+
+                // all this before we await because +wait
+                Assert.IsTrue(runner.IsCompleted); // shutdown completes the runner
+                Assert.IsFalse(runner.IsRunning); // no more running tasks
+                Assert.IsTrue(stopped);
+
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+            }
+        }
+
+        [Test]
+        public async void ShutdownWhenRunningWithoutWait()
+        {
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
+            {
+                var stopped = false;
+                runner.Stopped += (sender, args) => { stopped = true; };
+
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false
+                runner.Add(new MyTask(5000));
+                Assert.IsTrue(runner.IsRunning); // is running the task
+
+                runner.Shutdown(false, false); // -force +wait
+
+                // all this before we await because -wait
+                Assert.IsTrue(runner.IsCompleted); // shutdown completes the runner
+                Assert.IsTrue(runner.IsRunning); // still running the task
+                Assert.IsFalse(stopped);
+
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+
+                // and then...
+                Assert.IsFalse(runner.IsRunning); // no more running tasks
+                Assert.IsTrue(stopped);
+            }
+        }
+
+        [Test]
+        public async void ShutdownCompletesTheRunner()
+        {
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
+            {
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false
+
+                // shutdown -force => run all queued tasks
+                runner.Shutdown(false, false); // -force -wait
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+
+                Assert.IsFalse(runner.IsRunning); // still not running anything
+                Assert.IsTrue(runner.IsCompleted); // shutdown completes the runner
+
+                // cannot add tasks to it anymore
+                Assert.IsFalse(runner.TryAdd(new MyTask()));
+                Assert.Throws<InvalidOperationException>(() =>
+                {
+                    runner.Add(new MyTask());
+                });
+            } 
+        }

        [Test]
        public async void ShutdownFlushesTheQueue()
        {
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
            {
-                Assert.IsFalse(runner.IsRunning);
+                MyTask t;
+
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false
                runner.Add(new MyTask(5000));
                runner.Add(new MyTask());
-                var t = new MyTask();
-                runner.Add(t);
-                Assert.IsTrue(runner.IsRunning); // is running the first task
+                runner.Add(t = new MyTask());
+                Assert.IsTrue(runner.IsRunning); // is running tasks
+
+                // shutdown -force => run all queued tasks
                runner.Shutdown(false, false); // -force -wait
-                await runner; // wait for the entire runner operation to complete
+                Assert.IsTrue(runner.IsRunning); // is running tasks
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+
                Assert.AreNotEqual(DateTime.MinValue, t.Ended); // t has run
            }
        }
@@ -85,15 +180,20 @@ namespace Umbraco.Tests.Scheduling
        {
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
            {
-                Assert.IsFalse(runner.IsRunning);
+                MyTask t;
+
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false
                runner.Add(new MyTask(5000));
                runner.Add(new MyTask());
-                var t = new MyTask();
-                runner.Add(t);
-                Assert.IsTrue(runner.IsRunning); // is running the first task
+                runner.Add(t = new MyTask());
+                Assert.IsTrue(runner.IsRunning); // is running tasks
+
+                // shutdown +force => tries to cancel the current task, ignores queued tasks
                runner.Shutdown(true, false); // +force -wait
-                await runner; // wait for the entire runner operation to complete
-                Assert.AreEqual(DateTime.MinValue, t.Ended); // t has not run
+                Assert.IsTrue(runner.IsRunning); // is running that long task it cannot cancel
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+
+                Assert.AreEqual(DateTime.MinValue, t.Ended); // t has *not* run
            }
        }

@@ -102,23 +202,106 @@ namespace Umbraco.Tests.Scheduling
        {
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
            {
-                Assert.IsFalse(runner.IsRunning);
+
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false
                runner.Add(new MyTask(5000));
                runner.Add(new MyTask());
                runner.Add(new MyTask());
-                Assert.IsTrue(runner.IsRunning); // is running the task
+                Assert.IsTrue(runner.IsRunning); // is running tasks
+
+                // shutdown -force => run all queued tasks
                runner.Shutdown(false, false); // -force -wait
-                Assert.IsTrue(runner.IsCompleted);
-                Assert.IsTrue(runner.IsRunning); // still running that task
+
+                Assert.IsTrue(runner.IsCompleted); // shutdown completes the runner
+                Assert.IsTrue(runner.IsRunning); // still running a task
                Thread.Sleep(3000);
-                Assert.IsTrue(runner.IsRunning); // still running that task
+                Assert.IsTrue(runner.IsRunning); // still running a task
+
+                // shutdown +force => tries to cancel the current task, ignores queued tasks
                runner.Shutdown(true, false); // +force -wait
-                await runner; // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+            }
+        }
+
+
+        [Test]
+        public async void HostingStopNonImmediate()
+        {
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
+            {
+                MyTask t;
+
+                var stopped = false;
+                runner.Stopped += (sender, args) => { stopped = true; };
+                var terminating = false;
+                runner.Terminating += (sender, args) => { terminating = true; };
+                var terminated = false;
+                runner.Terminated += (sender, args) => { terminated = true; };
+
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false
+                runner.Add(new MyTask(5000));
+                runner.Add(new MyTask());
+                runner.Add(t = new MyTask());
+                Assert.IsTrue(runner.IsRunning); // is running the task
+
+                runner.Stop(false); // -immediate = -force, -wait
+                Assert.IsTrue(terminating); // has raised that event
+                Assert.IsFalse(terminated); // but not terminated yet
+
+                // all this before we await because -wait
+                Assert.IsTrue(runner.IsCompleted); // shutdown completes the runner
+                Assert.IsTrue(runner.IsRunning); // still running the task
+
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+                Assert.IsFalse(runner.IsRunning);
+                Assert.IsTrue(stopped);
+
+                await runner.TerminatedAwaitable; // runner terminates, within test's timeout
+                Assert.IsTrue(terminated); // has raised that event
+
+                Assert.AreNotEqual(DateTime.MinValue, t.Ended); // t has run
            }
        }

        [Test]
-        public void Create_IsRunning()
+        public async void HostingStopImmediate()
+        {
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
+            {
+                MyTask t;
+
+                var stopped = false;
+                runner.Stopped += (sender, args) => { stopped = true; };
+                var terminating = false;
+                runner.Terminating += (sender, args) => { terminating = true; };
+                var terminated = false;
+                runner.Terminated += (sender, args) => { terminated = true; };
+
+                Assert.IsFalse(runner.IsRunning); // because AutoStart is false
+                runner.Add(new MyTask(5000));
+                runner.Add(new MyTask());
+                runner.Add(t = new MyTask());
+                Assert.IsTrue(runner.IsRunning); // is running the task
+
+                runner.Stop(true); // +immediate = +force, +wait
+                Assert.IsTrue(terminating); // has raised that event
+                Assert.IsTrue(terminated); // and that event
+                Assert.IsTrue(stopped); // and that one
+
+                // and all this before we await because +wait
+                Assert.IsTrue(runner.IsCompleted); // shutdown completes the runner
+                Assert.IsFalse(runner.IsRunning); // done running
+
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
+                await runner.TerminatedAwaitable; // runner terminates, within test's timeout
+
+                Assert.AreEqual(DateTime.MinValue, t.Ended); // t has *not* run
+            }
+        }
+
+        
+        [Test]
+        public void Create_IsNotRunning()
        {
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
            {
@@ -126,14 +309,17 @@ namespace Umbraco.Tests.Scheduling
            }
        }

-        [Ignore]
+        
        [Test]
        public async void Create_AutoStart_IsRunning()
        {
-            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { AutoStart = true }))
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions
            {
-                Assert.IsTrue(runner.IsRunning);
-                await runner; // wait for the entire runner operation to complete
+                AutoStart = true
+            }))
+            {
+                Assert.IsTrue(runner.IsRunning); // because AutoStart is true
+                await runner.StoppedAwaitable; // runner stops, within test's timeout
            }
        }

@@ -142,7 +328,7 @@ namespace Umbraco.Tests.Scheduling
        {
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { AutoStart = true, KeepAlive = true }))
            {
-                Assert.IsTrue(runner.IsRunning);
+                Assert.IsTrue(runner.IsRunning); // because AutoStart is true
                Thread.Sleep(800); // for long
                Assert.IsTrue(runner.IsRunning);
                // dispose will stop it
@@ -159,8 +345,13 @@ namespace Umbraco.Tests.Scheduling
                // dispose will stop it
            }

-            await runner; // wait for the entire runner operation to complete
+            await runner.StoppedAwaitable; // runner stops, within test's timeout
+            //await runner.TerminatedAwaitable; // NO! see note below
            Assert.Throws<InvalidOperationException>(() => runner.Add(new MyTask()));
+
+            // but do NOT await on TerminatedAwaitable - disposing just shuts the runner down
+            // so that we don't have a runaway task in tests, etc - but it does NOT terminate
+            // the runner - it really is NOT a nice way to end a runner - it's there for tests
        }
      
        [Test]
@@ -188,7 +379,7 @@ namespace Umbraco.Tests.Scheduling
                runner.Add(new MyTask());
                Assert.IsTrue(runner.IsRunning);
                waitHandle.WaitOne();
-                await runner; //since we are not being kept alive, it will quit
+                await runner.StoppedAwaitable; //since we are not being kept alive, it will quit
                Assert.IsFalse(runner.IsRunning);
            }
        }
@@ -221,11 +412,11 @@ namespace Umbraco.Tests.Scheduling
                runner.Add(task);
                await runner.CurrentThreadingTask;   // wait for the Task operation to complete
                Assert.IsTrue(task.Ended != default(DateTime)); // task is done
-                await runner;               // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable;               // wait for the entire runner operation to complete
            }
        }

-        [Ignore]
+        
        [Test]
        public async void WaitOnRunner_Tasks()
        {
@@ -237,7 +428,7 @@ namespace Umbraco.Tests.Scheduling
            {
                tasks.ForEach(runner.Add);

-                await runner; // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete

                // check that tasks are done
                Assert.IsTrue(tasks.All(x => x.Ended != default(DateTime)));
@@ -260,7 +451,7 @@ namespace Umbraco.Tests.Scheduling
                runner.Add(task);
                waitHandle.WaitOne(); // wait 'til task is done
                Assert.IsTrue(task.Ended != default(DateTime)); // task is done
-                await runner; // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete
            }
        }

@@ -280,7 +471,7 @@ namespace Umbraco.Tests.Scheduling
                WaitHandle.WaitAll(tasks.Values.Select(x => (WaitHandle)x).ToArray());
                Assert.IsTrue(tasks.All(x => x.Key.Ended != default(DateTime)));

-                await runner; // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete
            }
        }

@@ -382,7 +573,7 @@ namespace Umbraco.Tests.Scheduling
            }
        }

-        [Ignore]
+        
        [Test]
        public void RecurringTaskTest()
        {
@@ -390,15 +581,11 @@ namespace Umbraco.Tests.Scheduling
            var waitHandle = new ManualResetEvent(false);
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
            {
-                runner.TaskCompleted += (sender, args) => runCount++;
-                runner.TaskStarting += async (sender, args) =>
+                runner.TaskCompleted += (sender, args) =>
                {
-                    //wait for each task to finish once it's started
-                    await sender.CurrentThreadingTask;
+                    runCount++;
                    if (runCount > 3)
-                    {
                        waitHandle.Set();
-                    }
                };

                var task = new MyRecurringTask(runner, 200, 500);
@@ -413,7 +600,10 @@ namespace Umbraco.Tests.Scheduling
                Assert.GreaterOrEqual(runCount, 4);

                // stops recurring
-                runner.Shutdown(false, false);
+                runner.Shutdown(false, true);
+
+                // check that task has been disposed (timer has been killed, etc)
+                Assert.IsTrue(task.IsDisposed);
            }
        }

@@ -422,7 +612,7 @@ namespace Umbraco.Tests.Scheduling
        {
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
            {
-                var task = new MyDelayedTask(200);
+                var task = new MyDelayedTask(200, false);
                runner.Add(task);
                Assert.IsTrue(runner.IsRunning);
                Thread.Sleep(5000);
@@ -431,7 +621,7 @@ namespace Umbraco.Tests.Scheduling
                task.Release();
                await runner.CurrentThreadingTask; //wait for current task to complete
                Assert.IsTrue(task.HasRun);
-                await runner; // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete
            }
        }

@@ -440,19 +630,19 @@ namespace Umbraco.Tests.Scheduling
        {
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
            {
-                var task = new MyDelayedTask(200);
+                var task = new MyDelayedTask(200, true);
                runner.Add(task);
                Assert.IsTrue(runner.IsRunning);
                Thread.Sleep(5000);
                Assert.IsTrue(runner.IsRunning); // still waiting for the task to release               
                Assert.IsFalse(task.HasRun);
                runner.Shutdown(false, false);
-                await runner; // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete
                Assert.IsTrue(task.HasRun);
            }
        }

-        [Ignore]
+        
        [Test]
        public void DelayedRecurring()
        {
@@ -460,15 +650,12 @@ namespace Umbraco.Tests.Scheduling
            var waitHandle = new ManualResetEvent(false);
            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
            {
-                runner.TaskCompleted += (sender, args) => runCount++;
-                runner.TaskStarting += async (sender, args) =>
+                runner.TaskCompleted += (sender, args) =>
                {
-                    //wait for each task to finish once it's started
-                    await sender.CurrentThreadingTask;
+                    runCount++;
                    if (runCount > 3)
-                    {
                        waitHandle.Set();
-                    }
+
                };

                var task = new MyDelayedRecurringTask(runner, 2000, 1000);
@@ -478,6 +665,7 @@ namespace Umbraco.Tests.Scheduling

                waitHandle.WaitOne();
                Assert.GreaterOrEqual(runCount, 4);
+                Assert.IsTrue(task.HasRun);

                // stops recurring
                runner.Shutdown(false, false);
@@ -492,10 +680,27 @@ namespace Umbraco.Tests.Scheduling
                var exceptions = new ConcurrentQueue<Exception>();
                runner.TaskError += (sender, args) => exceptions.Enqueue(args.Exception);

-                var task = new MyFailingTask(false); // -async
+                var task = new MyFailingTask(false, true, false); // -async, +running, -disposing
                runner.Add(task);
                Assert.IsTrue(runner.IsRunning);
-                await runner; // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete
+
+                Assert.AreEqual(1, exceptions.Count); // traced and reported
+            }
+        }
+
+        [Test]
+        public async void FailingTaskDisposing()
+        {
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
+            {
+                var exceptions = new ConcurrentQueue<Exception>();
+                runner.TaskError += (sender, args) => exceptions.Enqueue(args.Exception);
+
+                var task = new MyFailingTask(false, false, true); // -async, -running, +disposing
+                runner.Add(task);
+                Assert.IsTrue(runner.IsRunning);
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete

                Assert.AreEqual(1, exceptions.Count); // traced and reported
            }
@@ -509,10 +714,27 @@ namespace Umbraco.Tests.Scheduling
                var exceptions = new ConcurrentQueue<Exception>();
                runner.TaskError += (sender, args) => exceptions.Enqueue(args.Exception);

-                var task = new MyFailingTask(true); // +async
+                var task = new MyFailingTask(true, true, false); // +async, +running, -disposing
                runner.Add(task);
                Assert.IsTrue(runner.IsRunning);
-                await runner; // wait for the entire runner operation to complete
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete
+
+                Assert.AreEqual(1, exceptions.Count); // traced and reported
+            }
+        }
+
+        [Test]
+        public async void FailingTaskDisposingAsync()
+        {
+            using (var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions()))
+            {
+                var exceptions = new ConcurrentQueue<Exception>();
+                runner.TaskError += (sender, args) => exceptions.Enqueue(args.Exception);
+
+                var task = new MyFailingTask(false, false, true); // -async, -running, +disposing
+                runner.Add(task);
+                Assert.IsTrue(runner.IsRunning);
+                await runner.StoppedAwaitable; // wait for the entire runner operation to complete

                Assert.AreEqual(1, exceptions.Count); // traced and reported
            }
@@ -521,22 +743,28 @@ namespace Umbraco.Tests.Scheduling
        private class MyFailingTask : IBackgroundTask
        {
            private readonly bool _isAsync;
+            private readonly bool _running;
+            private readonly bool _disposing;

-            public MyFailingTask(bool isAsync)
+            public MyFailingTask(bool isAsync, bool running, bool disposing)
            {
                _isAsync = isAsync;
+                _running = running;
+                _disposing = disposing;
            }

            public void Run()
            {
                Thread.Sleep(1000);
-                throw new Exception("Task has thrown.");
+                if (_running)
+                    throw new Exception("Task has thrown.");
            }

            public async Task RunAsync(CancellationToken token)
            {
                await Task.Delay(1000);
-                throw new Exception("Task has thrown.");
+                if (_running)
+                    throw new Exception("Task has thrown.");
            }

            public bool IsAsync
@@ -544,19 +772,19 @@ namespace Umbraco.Tests.Scheduling
                get { return _isAsync; }
            }

-            // fixme - must also test what happens if we throw on dispose!
            public void Dispose()
-            { }
+            {
+                if (_disposing)
+                    throw new Exception("Task has thrown.");
+            }
        }

-        private class MyDelayedRecurringTask : DelayedRecurringTaskBase<MyDelayedRecurringTask>
+        private class MyDelayedRecurringTask : RecurringTaskBase
        {
-            public MyDelayedRecurringTask(IBackgroundTaskRunner<MyDelayedRecurringTask> runner, int delayMilliseconds, int periodMilliseconds)
-                : base(runner, delayMilliseconds, periodMilliseconds)
-            { }
+            public bool HasRun { get; private set; }

-            private MyDelayedRecurringTask(MyDelayedRecurringTask source)
-                : base(source)
+            public MyDelayedRecurringTask(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds)
+                : base(runner, delayMilliseconds, periodMilliseconds)
            { }

            public override bool IsAsync
@@ -564,49 +792,45 @@ namespace Umbraco.Tests.Scheduling
                get { return false; }
            }

-            public override void PerformRun()
+            public override bool PerformRun()
            {
-                // nothing to do at the moment
+                HasRun = true;
+                return true; // repeat
            }

-            public override Task PerformRunAsync()
+            public override Task<bool> PerformRunAsync(CancellationToken token)
            {
                throw new NotImplementedException();
            }

-            protected override MyDelayedRecurringTask GetRecurring()
-            {
-                return new MyDelayedRecurringTask(this);
-            }
+            public override bool RunsOnShutdown { get { return true; } }
        }

        private class MyDelayedTask : ILatchedBackgroundTask
        {
            private readonly int _runMilliseconds;
-            private readonly ManualResetEvent _gate;
+            private readonly ManualResetEventSlim _gate;

            public bool HasRun { get; private set; }

-            public MyDelayedTask(int runMilliseconds)
+            public MyDelayedTask(int runMilliseconds, bool runsOnShutdown)
            {
                _runMilliseconds = runMilliseconds;
-                _gate = new ManualResetEvent(false);
+                _gate = new ManualResetEventSlim(false);
+                RunsOnShutdown = runsOnShutdown;
            }

            public WaitHandle Latch
            {
-                get { return _gate; }
+                get { return _gate.WaitHandle; }
            }

            public bool IsLatched
            {
-                get { return true; }
+                get { return _gate.IsSet == false; }
            }

-            public bool RunsOnShutdown
-            {
-                get { return true; }
-            }
+            public bool RunsOnShutdown { get; private set; }

            public void Run()
            {
@@ -633,29 +857,23 @@ namespace Umbraco.Tests.Scheduling
            { }
        }

-        private class MyRecurringTask : RecurringTaskBase<MyRecurringTask>
+        private class MyRecurringTask : RecurringTaskBase
        {
            private readonly int _runMilliseconds;

-
-            public MyRecurringTask(IBackgroundTaskRunner<MyRecurringTask> runner, int runMilliseconds, int periodMilliseconds)
-                : base(runner, periodMilliseconds)
+            public MyRecurringTask(IBackgroundTaskRunner<RecurringTaskBase> runner, int runMilliseconds, int periodMilliseconds)
+                : base(runner, 0, periodMilliseconds)
            {
                _runMilliseconds = runMilliseconds;
            }

-            private MyRecurringTask(MyRecurringTask source, int runMilliseconds)
-                : base(source)
-            {
-                _runMilliseconds = runMilliseconds;
-            }
-
-            public override void PerformRun()
+            public override bool PerformRun()
            {                
                Thread.Sleep(_runMilliseconds);
+                return true; // repeat
            }

-            public override Task PerformRunAsync()
+            public override Task<bool> PerformRunAsync(CancellationToken token)
            {
                throw new NotImplementedException();
            }
@@ -665,10 +883,7 @@ namespace Umbraco.Tests.Scheduling
                get { return false; }
            }

-            protected override MyRecurringTask GetRecurring()
-            {
-                return new MyRecurringTask(this, _runMilliseconds);
-            }
+            public override bool RunsOnShutdown { get { return false; } }
        }

        private class MyTask : BaseTask
@@ -1,92 +1,98 @@
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Profiling;
 using Umbraco.Core.Sync;
+using Umbraco.Tests.TestHelpers;

 namespace Umbraco.Tests
 {
    [TestFixture]
    public class ServerEnvironmentHelperTests
    {
+
+        // note: in tests, read appContext._umbracoApplicationUrl and not the property,
+        // because reading the property does run some code, as long as the field is null.
+
        [Test]
-        public void Get_Base_Url_Single_Server_Orig_Request_Url_No_SSL()
+        public void SetApplicationUrlWhenNoSettings()
        {
            var appContext = new ApplicationContext(null)
            {
-                OriginalRequestUrl = "test.com"
+                UmbracoApplicationUrl = null // NOT set
            };

-            ConfigurationManager.AppSettings.Set("umbracoUseSSL", "false");
+            ConfigurationManager.AppSettings.Set("umbracoUseSSL", "true"); // does not make a diff here

-            var result = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(
-                appContext,
-                Mock.Of<IUmbracoSettingsSection>(
-                    section => 
-                        section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Servers == Enumerable.Empty<IServer>())
-                        && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>()));
-
-
-            Assert.AreEqual("http://test.com/", result);
-        }
-
-        [Test]
-        public void Get_Base_Url_Single_Server_Orig_Request_Url_With_SSL()
-        {
-            var appContext = new ApplicationContext(null)
-            {
-                OriginalRequestUrl = "test.com"
-            };
-
-            ConfigurationManager.AppSettings.Set("umbracoUseSSL", "true");
-
-            var result = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(
-                appContext,
+            ServerEnvironmentHelper.TrySetApplicationUrlFromSettings(appContext,
                Mock.Of<IUmbracoSettingsSection>(
                    section =>
                        section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Servers == Enumerable.Empty<IServer>())
+                        && section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null)
                        && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>()));


-            Assert.AreEqual("https://test.com/", result);
+            // still NOT set
+            Assert.IsNull(appContext._umbracoApplicationUrl);
        }

        [Test]
-        public void Get_Base_Url_Single_Server_Via_Config_Url_No_SSL()
+        public void SetApplicationUrlFromDcSettingsNoSsl()
        {
            var appContext = new ApplicationContext(null);

            ConfigurationManager.AppSettings.Set("umbracoUseSSL", "false");

-            var result = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(
-                appContext,
+            ServerEnvironmentHelper.TrySetApplicationUrlFromSettings(appContext,
                Mock.Of<IUmbracoSettingsSection>(
                    section =>
                        section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Servers == Enumerable.Empty<IServer>())
-                        && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>(tasksSection => tasksSection.BaseUrl == "mycoolhost.com/hello/world")));
+                        && section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null)
+                        && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>(tasksSection => tasksSection.BaseUrl == "mycoolhost.com/hello/world/")));


-            Assert.AreEqual("http://mycoolhost.com/hello/world/", result);
+            Assert.AreEqual("http://mycoolhost.com/hello/world", appContext._umbracoApplicationUrl);
        }

        [Test]
-        public void Get_Base_Url_Single_Server_Via_Config_Url_With_SSL()
+        public void SetApplicationUrlFromDcSettingsSsl()
        {
            var appContext = new ApplicationContext(null);

            ConfigurationManager.AppSettings.Set("umbracoUseSSL", "true");

-            var result = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(
-                appContext,
+            ServerEnvironmentHelper.TrySetApplicationUrlFromSettings(appContext,
                Mock.Of<IUmbracoSettingsSection>(
                    section =>
                        section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Servers == Enumerable.Empty<IServer>())
+                        && section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null)
                        && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>(tasksSection => tasksSection.BaseUrl == "mycoolhost.com/hello/world")));


-            Assert.AreEqual("https://mycoolhost.com/hello/world/", result);
+            Assert.AreEqual("https://mycoolhost.com/hello/world", appContext._umbracoApplicationUrl);
+        }
+
+        [Test]
+        public void SetApplicationUrlFromWrSettingsSsl()
+        {
+            var appContext = new ApplicationContext(null);
+
+            ConfigurationManager.AppSettings.Set("umbracoUseSSL", "true"); // does not make a diff here
+
+            ServerEnvironmentHelper.TrySetApplicationUrlFromSettings(appContext,
+                Mock.Of<IUmbracoSettingsSection>(
+                    section =>
+                        section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Servers == Enumerable.Empty<IServer>())
+                        && section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == "httpx://whatever.com/hello/world/")
+                        && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>(tasksSection => tasksSection.BaseUrl == "mycoolhost.com/hello/world")));
+
+
+            Assert.AreEqual("httpx://whatever.com/hello/world", appContext._umbracoApplicationUrl);
        }
    }
 }
@@ -58,9 +58,9 @@
    <Reference Include="AutoMapper.Net4">
      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
    </Reference>
-    <Reference Include="Examine, Version=0.1.62.2941, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Examine, Version=0.1.65.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Examine.0.1.62.2941\lib\Examine.dll</HintPath>
+      <HintPath>..\packages\Examine.0.1.65.0\lib\Examine.dll</HintPath>
    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -169,6 +169,7 @@
    <Compile Include="AttemptTests.cs" />
    <Compile Include="Cache\CacheRefresherTests.cs" />
    <Compile Include="CoreStrings\StringValidationTests.cs" />
+    <Compile Include="Controllers\BackOfficeControllerUnitTests.cs" />
    <Compile Include="FrontEnd\UmbracoHelperTests.cs" />
    <Compile Include="Integration\GetCultureTests.cs" />
    <Compile Include="Membership\DynamicMemberContentTests.cs" />
@@ -14,7 +14,7 @@ namespace Umbraco.Tests.UmbracoExamine
 		public void Events_Ignoring_Node()
 		{
 			//change the parent id so that they are all ignored
-			var existingCriteria = ((IndexCriteria)_indexer.IndexerData);
+			var existingCriteria = _indexer.IndexerData;
 			_indexer.IndexerData = new IndexCriteria(existingCriteria.StandardFields, existingCriteria.UserFields, existingCriteria.IncludeNodeTypes, existingCriteria.ExcludeNodeTypes,
 				999); //change to 999

@@ -53,7 +53,7 @@ namespace Umbraco.Tests.UmbracoExamine
 		public void Index_Move_Media_From_Non_Indexable_To_Indexable_ParentID()
 		{
 			//change parent id to 1116
-			var existingCriteria = ((IndexCriteria)_indexer.IndexerData);
+			var existingCriteria = _indexer.IndexerData;
 			_indexer.IndexerData = new IndexCriteria(existingCriteria.StandardFields, existingCriteria.UserFields, existingCriteria.IncludeNodeTypes, existingCriteria.ExcludeNodeTypes,
 				1116);
 			
@@ -110,7 +110,7 @@ namespace Umbraco.Tests.UmbracoExamine
 			_indexer.ReIndexNode(node, IndexTypes.Media);

 			//change the parent node id to be the one it used to exist under
-			var existingCriteria = ((IndexCriteria)_indexer.IndexerData);
+			var existingCriteria = _indexer.IndexerData;
 			_indexer.IndexerData = new IndexCriteria(existingCriteria.StandardFields, existingCriteria.UserFields, existingCriteria.IncludeNodeTypes, existingCriteria.ExcludeNodeTypes,
 				2222);

@@ -4,12 +4,19 @@ using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.IO;

 namespace Umbraco.Tests
 {
    [TestFixture]
    public class UriExtensionsTests
    {
+        [TearDown]
+        public void TearDown()
+        {
+            SystemDirectories.Root = "";
+        }
+
        [TestCase("http://www.domain.com/umbraco", "", true)]
        [TestCase("http://www.domain.com/Umbraco/", "", true)]
        [TestCase("http://www.domain.com/umbraco/default.aspx", "", true)]
@@ -35,6 +42,8 @@ namespace Umbraco.Tests
        [TestCase("http://www.domain.com/umbraco/test/legacyAjaxCalls.ashx?some=query&blah=js", "", true)]  
        public void Is_Back_Office_Request(string input, string virtualPath, bool expected)
        {
+            SystemDirectories.Root = virtualPath;
+
            var source = new Uri(input);
            Assert.AreEqual(expected, source.IsBackOfficeRequest(virtualPath));
        }
@@ -2,25 +2,25 @@
 <packages>
  <package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.62.2941" targetFramework="net45" />
-  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
+  <package id="Examine" version="0.1.65.0" targetFramework="net45" />
+  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net4" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net40" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net4" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net4" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net4" />
  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
  <package id="Microsoft.AspNet.WebApi.SelfHost" version="4.0.30506.0" targetFramework="net45" />
  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net4" />
  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
  <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
-  <package id="NUnit" version="2.6.2" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="2.32.0" targetFramework="net40" />
+  <package id="NUnit" version="2.6.2" targetFramework="net4" />
+  <package id="Selenium.WebDriver" version="2.32.0" targetFramework="net4" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
+  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net4" />
 </packages>
@@ -22,9 +22,13 @@
        "jquery": "2.0.3",
        "jquery-file-upload": "~9.4.0",
        "jquery-ui": "1.10.3",
-        "angular-dynamic-locale":  "~0.1.27"
+        "angular-dynamic-locale": "~0.1.27",
+        "bootstrap-tabdrop": "~1.0.0"
    },
    "exportsOverride": {
+        "bootstrap-tabdrop": { 
+            "": "build/js/bootstrap-tabdrop.min.js"
+        },
        "rgrove-lazyload": {
            "": "lazyload.js"
        },
@@ -38,7 +42,7 @@
            "": "tmhDynamicLocale.min.{js,js.map}"
        },
        "jquery": {
-            "": "jquery.min.{js,map}"  
+            "": "jquery.min.{js,map}"
        },
        "jquery-file-upload": {
            "": "**/jquery.{fileupload,fileupload-process,fileupload-angular,fileupload-image}.js"
@@ -53,9 +57,9 @@
        "blueimp-tmpl": {
            "ignore": "*.ignore"
        },
-        
+
        "blueimp-canvas-to-blob": {
            "ignore": "*.ignore"
        }
    }
-}
+}
@@ -418,7 +418,7 @@ module.exports = function (grunt) {
                        //this is the same as 'byComponent', however we will not allow
                        // folders with '.' in them since the grunt copy task does not like that
                        var componentWithoutPeriod = component.replace(".", "-");
-                        return path.join(componentWithoutPeriod, type);
+                        return path.join(componentWithoutPeriod, type);                        
                    }
                }
            }
@@ -229,7 +229,7 @@ textarea {
 .radio input[type="radio"],
 .checkbox input[type="checkbox"] {
  float: left;
-  margin-left: -20px;
+  margin-left: 0px;
 }

 // Move the options list down to align with labels
@@ -9,7 +9,7 @@ LazyLoad.js([
      '/Umbraco/js/umbraco.security.js',
      '/Umbraco/ServerVariables',
      '/Umbraco/lib/spectrum/spectrum.js',
-      'http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js',
+      'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js',
      '/umbraco/js/canvasdesigner.panel.js',
 ], function () {
    jQuery(document).ready(function () {
@@ -35,6 +35,14 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
        $scope.previewDevice = device;
    };

+    /*****************************************************************************/
+    /* Exit Preview */
+    /*****************************************************************************/
+
+    $scope.exitPreview = function () {
+        window.top.location.href = "/umbraco/endPreview.aspx?redir=%2f" + $scope.pageId;
+    };
+
    /*****************************************************************************/
    /* UI designer managment */
    /*****************************************************************************/
@@ -180,7 +188,7 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
                        // TODO: special init for font family picker
                        if (item.type == "googlefontpicker" && item.values.fontFamily) {
                            var variant = item.values.fontWeight != "" || item.values.fontStyle != "" ? ":" + item.values.fontWeight + item.values.fontStyle : "";
-                            var gimport = "@import url('http://fonts.googleapis.com/css?family=" + item.values.fontFamily + variant + "');";
+                            var gimport = "@import url('https://fonts.googleapis.com/css?family=" + item.values.fontFamily + variant + "');";
                            if ($.inArray(gimport, parameters) < 0) {
                                parameters.splice(0, 0, gimport);
                            }
@@ -412,7 +420,7 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
    var webFontScriptLoaded = false;
    var loadGoogleFont = function (font) {
        if (!webFontScriptLoaded) {
-            $.getScript('http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js')
+            $.getScript('https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js')
            .done(function () {
                webFontScriptLoaded = true;
                // Recursively call once webfont script is available.
@@ -19,7 +19,7 @@ var refreshLayout = function (parameters) {
 var webFontScriptLoaded = false;
 var getFont = function (font) {
    if (!webFontScriptLoaded) {
-        $.getScript('http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js')
+        $.getScript('https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js')
        .done(function () {
            webFontScriptLoaded = true;
            // Recursively call once webfont script is available.
@@ -34,6 +34,9 @@
                        <i></i>
                    </a>
                </li>
+                <li ng-click="exitPreview()">
+                    <a href="#" title="Exit Preview"><i class="icon icon-wrong"></i><span> </span></a>
+                </li>
            </ul>

            <ul class="sections" ng-class="{selected: !showDevicesPreview}" ng-if="enableCanvasdesigner > 0">
@@ -40,6 +40,8 @@ angular.module("umbraco.directives")
                    }

                });
+
+                $('.nav-pills, .nav-tabs').tabdrop();
            }

            scope.showTabs = iAttrs.tabs ? true : false;
@@ -22,6 +22,9 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
                if (scope.showTray) {
                    return 'slide';
                }
+                else if (scope.showTray === false) {
+                    return 'slide';
+                }
                else {
                    return '';
                }
@@ -49,26 +52,35 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
 					}
 				});
 			}
-            
-            //Listen for global state changes
-            eventsService.on("appState.globalState.changed", function (e, args) {
-			    if (args.key === "showTray") {
-			        scope.showTray = args.value;
-			    }
-			    if (args.key === "stickyNavigation") {
-			        scope.stickyNavigation = args.value;
-			    }
-			});

-			eventsService.on("appState.sectionState.changed", function (e, args) {
-			    if (args.key === "currentSection") {
-			        scope.currentSection = args.value;
-			    }
-			});
-            
-			eventsService.on("app.reInitialize", function (e, args) {
+			var evts = [];
+
+            //Listen for global state changes
+            evts.push(eventsService.on("appState.globalState.changed", function(e, args) {
+                if (args.key === "showTray") {
+                    scope.showTray = args.value;
+                }
+                if (args.key === "stickyNavigation") {
+                    scope.stickyNavigation = args.value;
+                }
+            }));
+
+            evts.push(eventsService.on("appState.sectionState.changed", function(e, args) {
+                if (args.key === "currentSection") {
+                    scope.currentSection = args.value;
+                }
+            }));
+
+            evts.push(eventsService.on("app.reInitialize", function(e, args) {
                //re-load the sections if we're re-initializing (i.e. package installed)
-			    loadSections();
+                loadSections();
+            }));
+
+            //ensure to unregister from all events!
+			scope.$on('$destroy', function () {
+			    for (var e in evts) {
+			        eventsService.unsubscribe(evts[e]);
+			    }
 			});

 			//on page resize
@@ -83,6 +95,13 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
 			};

 			scope.sectionClick = function (section) {
+			    if (navigationService.userDialog) {
+			        navigationService.userDialog.close();
+			    }
+			    if (navigationService.helpDialog) {
+			        navigationService.helpDialog.close();
+			    }
+			    
 			    navigationService.hideSearch();
 			    navigationService.showTree(section.alias);
 			    $location.path("/" + section.alias);
@@ -92,8 +111,20 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
 				navigationService.reloadSection(section.alias);
 			};

-			scope.trayClick = function(){
-				navigationService.showTray();
+			scope.trayClick = function () {
+                // close dialogs
+			    if (navigationService.userDialog) {
+			        navigationService.userDialog.close();
+			    }
+			    if (navigationService.helpDialog) {
+			        navigationService.helpDialog.close();
+			    }
+
+			    if (appState.getGlobalState("showTray") === true) {
+			        navigationService.hideTray();
+			    } else {
+			        navigationService.showTray();
+			    }
 			};
            
 			loadSections();
@@ -48,23 +48,25 @@ function valFormManager(serverValidationManager, $rootScope, $log, $timeout, not
                element.addClass(className);
            }

+            var unsubscribe = [];
+
            //listen for the forms saving event
-            scope.$on(savingEventName, function (ev, args) {
+            unsubscribe.push(scope.$on(savingEventName, function(ev, args) {
                element.addClass(className);

                //set the flag so we can check to see if we should display the error.
                isSavingNewItem = $routeParams.create;
-            });
+            }));

            //listen for the forms saved event
-            scope.$on(savedEvent, function (ev, args) {
+            unsubscribe.push(scope.$on(savedEvent, function(ev, args) {
                //remove validation class
                element.removeClass(className);

                //clear form state as at this point we retrieve new data from the server
                //and all validation will have cleared at this point    
                formCtrl.$setPristine();
-            });
+            }));

            //This handles the 'unsaved changes' dialog which is triggered when a route is attempting to be changed but
            // the form has pending changes
@@ -92,10 +94,12 @@ function valFormManager(serverValidationManager, $rootScope, $log, $timeout, not
                }

            });
+            unsubscribe.push(locationEvent);
+
            //Ensure to remove the event handler when this instance is destroyted
            scope.$on('$destroy', function() {
-                if(locationEvent){
-                    locationEvent();
+                for (var u in unsubscribe) {
+                    unsubscribe[u]();
                }
            });

@@ -96,8 +96,10 @@ function valPropertyMsg(serverValidationManager) {
            //create properties on our custom scope so we can use it in our template
            scope.errorMsg = "";

+            var unsubscribe = [];
+
            //listen for form error changes
-            scope.$on("valStatusChanged", function (evt, args) {
+            unsubscribe.push(scope.$on("valStatusChanged", function(evt, args) {
                if (args.form.$invalid) {

                    //first we need to check if the valPropertyMsg validity is invalid
@@ -123,10 +125,10 @@ function valPropertyMsg(serverValidationManager) {
                    hasError = false;
                    scope.errorMsg = "";
                }
-            }, true);
+            }, true));

            //listen for the forms saving event
-            scope.$on("formSubmitting", function (ev, args) {
+            unsubscribe.push(scope.$on("formSubmitting", function(ev, args) {
                showValidation = true;
                if (hasError && scope.errorMsg === "") {
                    scope.errorMsg = getErrorMsg();
@@ -135,15 +137,15 @@ function valPropertyMsg(serverValidationManager) {
                    scope.errorMsg = "";
                    stopWatch();
                }
-            });
+            }));

            //listen for the forms saved event
-            scope.$on("formSubmitted", function (ev, args) {
+            unsubscribe.push(scope.$on("formSubmitted", function(ev, args) {
                showValidation = false;
                scope.errorMsg = "";
                formCtrl.$setValidity('valPropertyMsg', true);
                stopWatch();
-            });
+            }));

            //listen for server validation changes
            // NOTE: we pass in "" in order to listen for all validation changes to the content property, not for
@@ -179,7 +181,16 @@ function valPropertyMsg(serverValidationManager) {
                    serverValidationManager.unsubscribe(scope.property.alias, "");
                });
            }
+
+            //when the scope is disposed we need to unsubscribe
+            scope.$on('$destroy', function () {
+                for (var u in unsubscribe) {
+                    unsubscribe[u]();
+                }
+            });
        }
+
+
    };
 }
 angular.module('umbraco.directives.validation').directive("valPropertyMsg", valPropertyMsg);
@@ -43,8 +43,10 @@ function valToggleMsg(serverValidationManager) {
                }
            });
            
+            var unsubscribe = [];
+
            //listen for the saving event (the result is a callback method which is called to unsubscribe)
-            var unsubscribeSaving = scope.$on("formSubmitting", function (ev, args) {
+            unsubscribe.push(scope.$on("formSubmitting", function(ev, args) {
                showValidation = true;
                if (formCtrl[attr.valMsgFor].$error[attr.valToggleMsg]) {
                    element.show();
@@ -56,20 +58,21 @@ function valToggleMsg(serverValidationManager) {
                else {
                    element.hide();
                }
-            });
+            }));
            
            //listen for the saved event (the result is a callback method which is called to unsubscribe)
-            var unsubscribeSaved = scope.$on("formSubmitted", function (ev, args) {
+            unsubscribe.push(scope.$on("formSubmitted", function(ev, args) {
                showValidation = false;
                element.hide();
-            });
+            }));

            //when the element is disposed we need to unsubscribe!
            // NOTE: this is very important otherwise if this directive is part of a modal, the listener still exists because the dom 
            // element might still be there even after the modal has been hidden.
            element.bind('$destroy', function () {
-                unsubscribeSaving();
-                unsubscribeSaved();
+                for (var u in unsubscribe) {
+                    unsubscribe[u]();
+                }
            });

        }
@@ -537,6 +537,13 @@ angular.module('umbraco.services')
                template: 'views/common/dialogs/ysod.html',
                show: true
            });
+        },
+
+        confirmDialog: function (ysodError) {
+
+            options.template = 'views/common/dialogs/confirm.html';
+            options.show = true;
+            return openDialog(options);
        }
    };
 });
@@ -15,7 +15,7 @@ function macroService() {
            
            //This regex will match an alias of anything except characters that are quotes or new lines (for legacy reasons, when new macros are created
            // their aliases are cleaned an invalid chars are stripped)
-            var expression = /(<\?UMBRACO_MACRO macroAlias=["']([^\"\'\n\r]+?)["'][\s\S]+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/i;
+            var expression = /(<\?UMBRACO_MACRO (?:.+?)?macroAlias=["']([^\"\'\n\r]+?)["'][\s\S]+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/i;
            var match = expression.exec(syntax);
            if (!match || match.length < 3) {
                return null;
@@ -513,23 +513,26 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
         * Opens the user dialog, next to the sections navigation
         * template is located in views/common/dialogs/user.html
         */
-        showUserDialog: function() {
+        showUserDialog: function () {
+            // hide tray and close help dialog
+            if (service.helpDialog) {
+                service.helpDialog.close();
+            }
+            service.hideTray();

-            if(userDialog){
-                userDialog.close();
-                userDialog = null;
+            if (service.userDialog) {
+                service.userDialog.close();
+                service.userDialog = undefined;
            }

-            userDialog = dialogService.open(
-                {
-                    template: "views/common/dialogs/user.html",
-                    modalClass: "umb-modal-left",
-                    show: true
-                });
-        
-            
+            service.userDialog = dialogService.open(
+            {
+                template: "views/common/dialogs/user.html",
+                modalClass: "umb-modal-left",
+                show: true
+            });

-            return userDialog;
+            return service.userDialog;
        },

        /**
@@ -541,7 +544,13 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
         * Opens the user dialog, next to the sections navigation
         * template is located in views/common/dialogs/user.html
         */
-        showHelpDialog: function() {
+        showHelpDialog: function () {
+            // hide tray and close user dialog
+            service.hideTray();
+            if (service.userDialog) {
+                service.userDialog.close();
+            }
+
            if(service.helpDialog){
                service.helpDialog.close();
                service.helpDialog = undefined;
@@ -206,7 +206,7 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
        },

        /** builds an image grid row */
-        buildRow: function(imgs, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin) {
+        buildRow: function(imgs, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin, totalRemaining) {
            var currRowWidth = 0;
            var row = { images: [] };

@@ -253,8 +253,8 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
                this.setImageStyle(row.images[j], sizes[j].width, sizes[j].height, margin, bottomMargin);
            }

-            if (row.images.length === 1) {
-                //if there's only one image on the row, set the container to max width
+            if (row.images.length === 1 && totalRemaining > 1) {
+                //if there's only one image on the row and there are more images remaining, set the container to max width
                row.images[0].style.width = maxRowWidth + "px"; 
            }
            
@@ -278,7 +278,7 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
        buildGrid: function(images, maxRowWidth, maxRowHeight, startingIndex, minDisplayHeight, idealImgPerRow, margin,imagesOnly) {

            var rows = [];
-            var imagesProcessed = 0;
+            var imagesProcessed = 0; 

            //first fill in all of the original image sizes and URLs
            for (var i = startingIndex; i < images.length; i++) {
@@ -298,7 +298,8 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
                var currImgs = images.slice(imagesProcessed);

                //build the row
-                var row = this.buildRow(currImgs, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin);
+                var remaining = images.length - imagesProcessed;
+                var row = this.buildRow(currImgs, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin, remaining);
                if (row.images.length > 0) {
                    rows.push(row);
                    imagesProcessed += row.images.length;
@@ -48,14 +48,16 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
        eventsService.emit("app.closeDialogs", event);
    };

+    var evts = [];
+
    //when a user logs out or timesout
-    eventsService.on("app.notAuthenticated", function() {
+    evts.push(eventsService.on("app.notAuthenticated", function() {
        $scope.authenticated = null;
        $scope.user = null;
-    });
+    }));
    
    //when the app is read/user is logged in, setup the data
-    eventsService.on("app.ready", function (evt, data) {
+    evts.push(eventsService.on("app.ready", function (evt, data) {
        
        $scope.authenticated = data.authenticated;
        $scope.user = data.user;
@@ -73,7 +75,7 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
                    notificationsService.add(notification);
                }
            }
-        });
+        })

        //if the user has changed we need to redirect to the root so they don't try to continue editing the
        //last item in the URL (NOTE: the user id can equal zero, so we cannot just do !data.lastUserId since that will resolve to true)
@@ -104,6 +106,13 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
              }, 3000);  
        }

+    }));
+
+    //ensure to unregister from all events!
+    $scope.$on('$destroy', function () {
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
+        }
    });

 }
@@ -47,15 +47,17 @@ function NavigationController($scope, $rootScope, $location, $log, $routeParams,

    $scope.selectedId = navigationService.currentId;

+    var evts = [];
+
    //Listen for global state changes
-    eventsService.on("appState.globalState.changed", function (e, args) {
+    evts.push(eventsService.on("appState.globalState.changed", function(e, args) {
        if (args.key === "showNavigation") {
            $scope.showNavigation = args.value;
        }
-    });
+    }));

    //Listen for menu state changes
-    eventsService.on("appState.menuState.changed", function (e, args) {
+    evts.push(eventsService.on("appState.menuState.changed", function(e, args) {
        if (args.key === "showMenuDialog") {
            $scope.showContextMenuDialog = args.value;
        }
@@ -71,20 +73,21 @@ function NavigationController($scope, $rootScope, $location, $log, $routeParams,
        if (args.key === "currentNode") {
            $scope.menuNode = args.value;
        }
-    });
+    }));

    //Listen for section state changes
-    eventsService.on("appState.treeState.changed", function (e, args) {
+    evts.push(eventsService.on("appState.treeState.changed", function(e, args) {
        var f = args;
        if (args.value.root && args.value.root.metaData.containsTrees === false) {
            $rootScope.emptySection = true;
-        }else{
+        }
+        else {
            $rootScope.emptySection = false;
        }
-    });
+    }));

    //Listen for section state changes
-    eventsService.on("appState.sectionState.changed", function (e, args) {
+    evts.push(eventsService.on("appState.sectionState.changed", function(e, args) {
        //section changed
        if (args.key === "currentSection") {
            $scope.currentSection = args.value;
@@ -93,26 +96,26 @@ function NavigationController($scope, $rootScope, $location, $log, $routeParams,
        if (args.key === "showSearchResults") {
            $scope.showSearchResults = args.value;
        }
-    });
+    }));

    //This reacts to clicks passed to the body element which emits a global call to close all dialogs
-    eventsService.on("app.closeDialogs", function (event) {
+    evts.push(eventsService.on("app.closeDialogs", function(event) {
        if (appState.getGlobalState("stickyNavigation")) {
            navigationService.hideNavigation();
            //TODO: don't know why we need this? - we are inside of an angular event listener.
            angularHelper.safeApply($scope);
        }
-    });
+    }));

    //when a user logs out or timesout
-    eventsService.on("app.notAuthenticated", function () {
+    evts.push(eventsService.on("app.notAuthenticated", function() {
        $scope.authenticated = false;
-    });
+    }));

    //when the application is ready and the user is authorized setup the data
-    eventsService.on("app.ready", function (evt, data) {
+    evts.push(eventsService.on("app.ready", function(evt, data) {
        $scope.authenticated = true;
-    });
+    }));

    //this reacts to the options item in the tree
    //todo, migrate to nav service
@@ -151,6 +154,13 @@ function NavigationController($scope, $rootScope, $location, $log, $routeParams,
            }, 300);
        }
    };
+
+    //ensure to unregister from all events!
+    $scope.$on('$destroy', function () {
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
+        }
+    });
 }

 //register it
@@ -2,7 +2,6 @@
 app.run(['userService', '$log', '$rootScope', '$location', 'navigationService', 'appState', 'editorState', 'fileManager', 'assetsService', 'eventsService', '$cookies', '$templateCache',
    function (userService, $log, $rootScope, $location, navigationService, appState, editorState, fileManager, assetsService, eventsService, $cookies, $templateCache) {

-
        //This sets the default jquery ajax headers to include our csrf token, we
        // need to user the beforeSend method because our token changes per user/login so
        // it cannot be static
@@ -16,8 +15,10 @@ app.run(['userService', '$log', '$rootScope', '$location', 'navigationService',
        eventsService.on("app.authenticated", function(evt, data) {
            assetsService._loadInitAssets().then(function() {
                appState.setGlobalState("isReady", true);
-                //send the ready event
+
+                //send the ready event with the included returnToPath,returnToSearch data
                eventsService.emit("app.ready", data);
+                returnToPath = null, returnToSearch = null;
            });
        });

@@ -44,7 +45,18 @@ app.run(['userService', '$log', '$rootScope', '$location', 'navigationService',
            wiring up it's controller, etc... and then redirect to the rejected URL.   */
        $rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {
            event.preventDefault();
-            $location.path(rejection.path).search(rejection.search);
+
+            var returnPath = null;
+            if (rejection.path == "/login" || rejection.path.startsWith("/login/")) {
+                //Set the current path before redirecting so we know where to redirect back to
+                returnPath = encodeURIComponent($location.url());                                
+            }
+
+            $location.path(rejection.path)
+            if (returnPath) {
+                $location.search("returnPath", returnPath);
+            }
+            
        });


@@ -28,7 +28,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
 					'Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company',
 					"There's a pretty big chance, you've visited a website powered by Umbraco today",
 					"'Umbraco-spotting' is the game of spotting big brands running Umbraco",
-					"At least 2 people have the Umbraco logo tattooed on them",
+					"At least 4 people have the Umbraco logo tattooed on them",
 					"'Umbraco' is the danish name for an allen key",
 					"Umbraco has been around since 2005, that's a looong time in IT",
 					"More than 400 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='http://codegarden14.com'>CodeGarden</a>", 
@@ -335,4 +335,4 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
 	};

 	return service;
-});
+});
@@ -305,7 +305,8 @@ textarea {
 .radio input[type="radio"],
 .checkbox input[type="checkbox"] {
  float: left;
-  margin-left: -20px;
+  margin-left: 0px;
+  margin-right:5px;
 }

 // Move the options list down to align with labels
@@ -793,3 +794,17 @@ legend + .control-group {
    position: relative;
    z-index: 1000;
 }
+
+
+
+@media (max-width: 767px) {
+
+  // Labels on own row
+  .form-horizontal .control-label {
+    width: 100%;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+
+}
@@ -176,3 +176,70 @@ body {
 .emptySection #contentwrapper {left: 80px;}
 .emptySection #speechbubble {left: 0;}
 .emptySection #navigation {display: none}
+
+@media (max-width: 767px) {
+    
+    // make leftcolumn smaller on tablets
+    #leftcolumn {
+      width: 60px;
+    }
+    #applications ul.sections {
+        width: 60px;
+    }
+    ul.sections.sections-tray {
+        width: 60px;
+    }
+    #applications-tray {
+        left: 60px;
+    }
+    #navigation {
+        left: 60px;
+    }
+    #contentwrapper, #contentcolumn {
+        left: 30px;
+    }
+    #umbracoMainPageBody .umb-modal-left.fade.in {
+      margin-left: 60px;
+    }
+}
+
+
+
+@media (max-width: 500px) {
+    
+    // make leftcolumn smaller on mobiles
+    #leftcolumn {
+      width: 40px;
+    }
+    #applications ul.sections {
+        width: 40px;
+    }
+    ul.sections li [class^="icon-"]:before {
+        font-size: 25px!important;
+    }
+    #applications ul.sections li.avatar a img  {
+        width: 25px;
+    }
+    ul.sections a span {
+        display:none !important;
+    }
+    #applications ul.sections-tray {
+        width: 40px;
+    }
+    ul.sections.sections-tray {
+        width: 40px;
+    }
+    #applications-tray {
+        left: 40px;
+    }
+    #navigation {
+        left: 40px;
+    }
+    #contentwrapper, #contentcolumn {
+        left: 20px;
+    }
+    #umbracoMainPageBody .umb-modal-left.fade.in {
+        margin-left: 40px;
+        width: 85%!important;
+    }
+}
@@ -22,9 +22,10 @@
 }

 .login-overlay .form {
+  position:fixed;
  display: block;
-  padding-top: 100px;
-  padding-left: 165px;
+  top: 100px;
+  left: 165px;
  width: 370px;
  text-align: right
 }
@@ -44,4 +45,12 @@
    padding-left: 6px;
    margin-top: 10px;
    text-align: center;
+}
+
+@media (max-width: 565px) {
+  // Remove padding on login-form on smaller devices
+  .login-overlay .form {
+    left: inherit;
+    right:25px;
+  }
 }
@@ -146,7 +146,7 @@ h5{

 .controls-row {
  padding-top: 5px;
-  margin-left: 240px !important;
+  margin-left: 240px;
 }
 .controls-row label {
  display: inline-block
@@ -63,6 +63,7 @@

 .umb-modal-left .umb-panel-header .umb-headline, .umb-modal-left .umb-panel-header h1 {
  width: auto;
+  padding-left: 0;
 }

 /* umb.dialog is used for the dialogs on the conent tree*/
@@ -1,19 +1,27 @@
 // Panel
 // -------------------------
-.umb-panel{
-          background: white;
-          position: absolute; 
-          top: 0px; bottom: 0px; left: 0px; right: 0px;}
+.umb-panel {
+    background: white;
+    position: absolute;
+    top: 0px;
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+}
+
+.umb-panel-nobody {
+    padding-top: 100px;
+    overflow: auto;
+}

-.umb-panel-nobody{padding-top: 100px; overflow: auto;}
 .umb-panel-header {
-  background: @grayLighter;
-  border-bottom: 1px solid @grayLight;
-  position: absolute;
-  height: 99px;
-  top: 0px;
-  right: 0px;
-  left: 0px;
+    background: @grayLighter;
+    border-bottom: 1px solid @grayLight;
+    position: absolute;
+    height: 99px;
+    top: 0px;
+    right: 0px;
+    left: 0px;
 }

 .umb-panel-body {
@@ -25,6 +33,7 @@
    clear: both;
    overflow: auto;
 }
+
 .umb-panel-body.no-header {
    top: 20px;
 }
@@ -37,76 +46,84 @@
    bottom: 31px !important;
 }

-/*
-.umb-tab-buttons.umb-bottom-bar {
-    bottom: 50px !important;
-}*/
-
 .umb-panel-header .umb-headline, .umb-panel-header h1 {
-  font-size: 16px;
-  border: none;
-  background: none;
-  margin: 15px 0 0 20px;
-  padding: 3px 5px;
-  height: auto;
-  width: 100%;
-  border: 1px solid @grayLighter;
+    font-size: 16px;
+    border: none;
+    background: none;
+    margin: 15px 0 0 20px;
+    padding: 3px 5px;
+    line-height: 1.4;
+    height: auto;
+    width: 100%;
+    border: 1px solid @grayLighter;
 }

-.umb-panel-header .umb-headline:focus,.umb-panel-header .umb-headline:active  {
-  border: 1px solid @grayLight;
-  background-color: @white;
+.umb-panel-header .umb-headline:focus, .umb-panel-header .umb-headline:active {
+    border: 1px solid @grayLight;
+    background-color: @white;
 }

-.umb-headline-editor-wrapper{
-  position: relative;
+.umb-headline-editor-wrapper {
+    position: relative;
 }

-.umb-headline-editor-wrapper .help-inline{
-  right: 0px;
-  top: 25px;
-  position: absolute;
-  font-size: 10px;
-  color: @red;
-  }
+.umb-headline-editor-wrapper .help-inline {
+    right: 0px;
+    top: 25px;
+    position: absolute;
+    font-size: 10px;
+    color: @red;
+}

-.umb-panel-header .umb-nav-tabs{
-  bottom: -1px;
-  position: absolute;
-  padding: 0px 0px 0px 20px;
+.umb-panel-header .umb-nav-tabs {
+    bottom: -1px;
+    position: absolute;
+    padding: 0px 0px 0px 20px;
 }


 .umb-panel-header p {
-  margin:0px 20px;
+    margin: 0px 20px;
 }

-.umb-btn-toolbar .dimmed, .umb-dimmed{
-  opacity: 0.6;
+.umb-btn-toolbar .dimmed, .umb-dimmed {
+    opacity: 0.6;
 }

-.umb-headline-editor-wrapper input  {
-  background: none;
-  border: none;
-  margin: -6px 0 0 0;
-  padding: 0 0 2px 0;
-  border-radius: 0;
-  line-height: 1em;
-  border: 1px solid transparent;
-  color: @black;
-  letter-spacing: -0.01em
-}
-.umb-headline-editor-wrapper input.ng-invalid  {
-  color: @red;
+.umb-headline-editor-wrapper input {
+    background: none;
+    border: none;
+    margin: -6px 0 0 0;
+    padding: 0 0 2px 0;
+    border-radius: 0;
+    line-height: normal;
+    border: 1px solid transparent;
+    color: @black;
+    letter-spacing: -0.01em;
 }

-.umb-headline-editor-wrapper input.ng-invalid::-webkit-input-placeholder {color: @red; line-height: 22px;}
-.umb-headline-editor-wrapper input.ng-invalid::-moz-placeholder {color: @red; line-height: 22px;}
-.umb-headline-editor-wrapper input.ng-invalid:-ms-input-placeholder {color: @red; line-height: 22px;}
+.umb-headline-editor-wrapper input.ng-invalid {
+    color: @red;
+}
+
+.umb-headline-editor-wrapper input.ng-invalid::-webkit-input-placeholder {
+    color: @red;
+    line-height: 22px;
+}
+
+.umb-headline-editor-wrapper input.ng-invalid::-moz-placeholder {
+    color: @red;
+    line-height: 22px;
+}
+
+.umb-headline-editor-wrapper input.ng-invalid:-ms-input-placeholder {
+    color: @red;
+    line-height: 22px;
+}

 .umb-panel-header i {
-  font-size: 13px;
-  vertical-align: middle;
+    font-size: 13px;
+    vertical-align: middle;
 }

 .umb-panel-header-meta {
@@ -119,65 +136,76 @@
 }

 .umb-panel-footer {
-  margin: 0;
-  padding: 20px;
-  z-index: 999;
-  position: absolute;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
+    margin: 0;
+    padding: 20px;
+    z-index: 999;
+    position: absolute;
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
 }


 /* Publish */
 .umb-btn-toolbar .dropdown-menu {
-  right: 0;
-  left: auto;
-  border-radius: @tabsBorderRadius;
-  box-shadow: none;
-  padding: 0
- }
-
- .umb-btn-toolbar .dropdown-menu small {
-  background: #fef9db;
-  display: block;
-  padding: 10px 20px;
- }
-
- .umb-btn-toolbar .dropdown-menu .btn {
-    margin: 20px 29px;
-    width: 80px
- }
-
-/* tab buttons */
-.umb-bottom-bar{
-    background: white;
-
-    -webkit-box-shadow: 0px -18px 20px rgba(255, 255, 255, 1);
-    -moz-box-shadow:    0px -18px 20px rgba(255, 255, 255, 1);
-    box-shadow:         0px -18px 20px rgba(255, 255, 255, 1);
-
-    border-top: 1px solid @grayLighter;
-
-    padding: 10px 0 10px 0;
-
-    position: fixed;
-    bottom: 0px;
-    left: 100px;
-    right: 20px;
-    z-index: 6010;
-};
-
-@media (min-width: 1101px) {
-    .umb-bottom-bar {left: 460px;}
+    right: 0;
+    left: auto;
+    border-radius: @tabsBorderRadius;
+    box-shadow: none;
+    padding: 0;
 }

-.umb-tab-buttons{padding-left: 240px;}
-.umb-tab-pane{padding-bottom: 90px}
+.umb-btn-toolbar .dropdown-menu small {
+    background: #fef9db;
+    display: block;
+    padding: 10px 20px;
+}

-.tab-content{overflow: visible; }
+.umb-btn-toolbar .dropdown-menu .btn  {
+    margin: 20px 29px;
+    width: 80px;
+}

-.umb-panel-footer-nav{
+/* tab buttons */
+.umb-bottom-bar {
+    background: white;
+    -webkit-box-shadow: 0px -18px 20px rgba(255, 255, 255, 1);
+    -moz-box-shadow: 0px -18px 20px rgba(255, 255, 255, 1);
+    box-shadow: 0px -18px 20px rgba(255, 255, 255, 1);
+    border-top: 1px solid @grayLighter;
+    padding: 10px 0 10px 0;
+    position: fixed;
+    bottom: 0;
+    left: 100px;
+    right: 40px;
+    z-index: 6010;
+
+    @media (min-width: 1101px) {
+        left: 460px;
+    }
+}
+
+.umb-tab-buttons {
+    padding-left: 0;
+
+    > .btn-group:not([style*="display:none"]):not([style*="display: none"]) {
+        margin-left: 0;
+    }
+
+    @media (min-width: 768px) {
+        padding-left: 180px;
+    }
+}
+
+.umb-tab-pane {
+    padding-bottom: 90px;
+}
+
+.tab-content {
+    overflow: visible;
+}
+
+.umb-panel-footer-nav {
    position: absolute;
    bottom: 0px;
    height: 30px;
@@ -191,93 +219,117 @@
 }

 .umb-panel-footer-nav li a {
-  border-radius: 0;
-  display: block;
-  float: left;
-  height: 30px;
-  background: @grayLighter;
-  text-align: center;
-  padding: 8px 0px 8px 30px;
-  position: relative;
-  margin: 0 1px 0 0; 
-  text-decoration: none;
-  color: @gray;
-  font-size: 11px;
+    border-radius: 0;
+    display: block;
+    float: left;
+    height: 30px;
+    background: @grayLighter;
+    text-align: center;
+    padding: 8px 0px 8px 30px;
+    position: relative;
+    margin: 0 1px 0 0;
+    text-decoration: none;
+    color: @gray;
+    font-size: 11px;
 }

 .umb-panel-footer-nav li a:after {
-  content: "";  
-  border-top: 16px solid transparent;
-  border-bottom: 16px solid transparent;
-  border-left: 16px solid @grayLighter;
-  position: absolute; right: -16px; top: 0;
-  z-index: 1;
-}
-      
-.umb-panel-footer-nav li a:before {
-  content: "";  
-  border-top: 16px solid transparent;
-  border-bottom: 16px solid transparent;
-  border-left: 16px solid @grayLight;
-  position: absolute; left: 0; top: 0;
+    content: "";
+    border-top: 16px solid transparent;
+    border-bottom: 16px solid transparent;
+    border-left: 16px solid @grayLighter;
+    position: absolute;
+    right: -16px;
+    top: 0;
+    z-index: 1;
 }

-.umb-panel-footer-nav li:first-child a{
-  padding-left: 20px; 
+.umb-panel-footer-nav li a:before {
+    content: "";
+    border-top: 16px solid transparent;
+    border-bottom: 16px solid transparent;
+    border-left: 16px solid @grayLight;
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.umb-panel-footer-nav li:first-child a {
+    padding-left: 20px;
 }

 .umb-panel-footer-nav li:first-child a:before {
-  display: none; 
+    display: none;
 }

 .umb-panel-footer-nav li:last-child a:after {
-  display: none; 
+    display: none;
 }




- // Utility classes
+// Utility classes

- //SD: Had to add these because if we want to use the bootstrap text colors
- // in a panel/editor they'll all show up as white on white - so we need to use the 
- // form styles
+//SD: Had to add these because if we want to use the bootstrap text colors
+// in a panel/editor they'll all show up as white on white - so we need to use the
+// form styles
 .umb-dialog .muted,
-.umb-panel .muted               { color: @grayLight; }
+.umb-panel .muted {
+    color: @grayLight;
+}

 .umb-dialog a.muted:hover,
 .umb-dialog a.muted:focus,
 .umb-panel a.muted:hover,
-.umb-panel a.muted:focus        { color: darken(@grayLight, 10%); }
+.umb-panel a.muted:focus {
+    color: darken(@grayLight, 10%);
+}

 .umb-dialog .text-warning,
-.umb-panel .text-warning        { color: @formWarningText; }
+.umb-panel .text-warning {
+    color: @formWarningText;
+}

 .umb-dialog a.text-warning:hover,
 .umb-dialog a.text-warning:focus,
 .umb-panel a.text-warning:hover,
-.umb-panel a.text-warning:focus { color: darken(@formWarningText, 10%); }
+.umb-panel a.text-warning:focus {
+    color: darken(@formWarningText, 10%);
+}

 .umb-dialog .text-error,
-.umb-panel .text-error          { color: @formErrorText; }
+.umb-panel .text-error {
+    color: @formErrorText;
+}

 .umb-dialog a.text-error:hover,
 .umb-dialog a.text-error:focus,
 .umb-panel a.text-error:hover,
-.umb-panel a.text-error:focus   { color: darken(@formErrorText, 10%); }
+.umb-panel a.text-error:focus {
+    color: darken(@formErrorText, 10%);
+}

 .umb-dialog .text-info,
-.umb-panel .text-info           { color: @formInfoText; }
+.umb-panel .text-info {
+    color: @formInfoText;
+}

 .umb-dialog a.text-info:hover,
 .umb-dialog a.text-info:focus,
 .umb-panel a.text-info:hover,
-.umb-panel a.text-info:focus    { color: darken(@formInfoText, 10%); }
+.umb-panel a.text-info:focus {
+    color: darken(@formInfoText, 10%);
+}

 .umb-dialog .text-success,
-.umb-panel .text-success        { color: @formSuccessText; }
+.umb-panel .text-success {
+    color: @formSuccessText;
+}

 .umb-dialog a.text-success:hover,
 .umb-dialog a.text-success:focus,
 .umb-panel a.text-success:hover,
-.umb-panel a.text-success:focus { color: darken(@formSuccessText, 10%); }
+.umb-panel a.text-success:focus {
+    color: darken(@formSuccessText, 10%);
+}
@@ -25,7 +25,7 @@
 }

 .umb-codeeditor{
-  width: 99%; 
+  width: 99%;
 }

 //
@@ -68,7 +68,7 @@ div.umb-codeeditor .umb-btn-toolbar {
 .mce-ico{font-size: 12px !important; color: @blackLight !important;}
 /* Special case to support helviticons for the tiny mce button controls */
 .mce-ico.mce-i-custom[class^="icon-"],
-.mce-ico.mce-i-custom[class*=" icon-"] {    
+.mce-ico.mce-i-custom[class*=" icon-"] {
  font-family: icomoon;
  font-size:16px !important;
 }
@@ -100,8 +100,8 @@ ul.color-picker li a  {
 /* pre-value editor */

 .control-group.color-picker-preval pre {
-    display: inline; 
-    margin-right: 20px; 
+    display: inline;
+    margin-right: 20px;
    margin-left: 10px;
 }

@@ -116,8 +116,8 @@ ul.color-picker li a  {
 // --------------------------------------------------
 .umb-mediapicker .add-link{
  display: inline-block;
-  height: 120px; 
-  width: 120px; 
+  height: 120px;
+  width: 120px;
  text-align: center;
  color: @grayLight;
  border: 2px @grayLight dashed !important;
@@ -187,7 +187,7 @@ ul.color-picker li a  {

 .umb-sortable-thumbnails li img
 {
-  max-width:100%; 
+  max-width:100%;
  max-height:100%;
  margin:auto;
  display:block;
@@ -206,12 +206,12 @@ ul.color-picker li a  {
 .umb-sortable-thumbnails .icon-holder *
 {
  color: @grayLight;
-  display: block 
+  display: block
 }


 //
-// Cropper 
+// Cropper
 // -------------------------------------------------

 .umb-cropper{
@@ -237,7 +237,7 @@ ul.color-picker li a  {
    position: relative;
    margin: auto;
 }
- 
+
 .umb-cropper-gravity .viewport{
   overflow: hidden;
   position: relative;
@@ -301,17 +301,13 @@ ul.color-picker li a  {
 // --------------------------------------------------
 .umb-folderbrowser .add-link{
  display: inline-block;
-  height: 120px; 
-  width: 120px; 
+  height: 120px;
+  width: 120px;
  text-align: center;
  border: 1px @grayLight dashed;
  line-height: 120px
 }

-.umb-folderbrowser .selector-overlay{
-  display: none !important;
-}
-
 .umb-upload-drop-zone{
    margin-bottom:5px;
 }
@@ -368,8 +364,8 @@ ul.color-picker li a  {



-.umb-photo-folder .picrow div a:first-child {    
-    width:100%;
+.umb-photo-folder .picrow div a:first-child {
+     width:100%;
    height:100%;
 }

@@ -382,15 +378,19 @@ ul.color-picker li a  {
 .umb-photo-folder a:hover{text-decoration: none}
 .umb-photo-folder .umb-non-thumbnail{
  text-align: center;
-  vertical-align: center;
+  vertical-align: middle;
  font-size: 12px;
  background: @grayLighter;
  color: @black;
  text-decoration: none;
 }

+.umb-photo-folder .selector-overlay{
+  display: none;
+}
+
 //this is a temp hack, to provide selectors in the dialog:
-.umb-photo-folder .pic:hover .selector-overlay{
+.umb-photo-folder .pic:hover .selector-overlay {
  position: absolute;
  bottom: 0px;
  left: 0px;
@@ -402,6 +402,11 @@ ul.color-picker li a  {
  text-align: center;
  color: white;
  opacity: 0.4;
+  text-decoration:none;
+
+    overflow: hidden;
+    text-overlow: ellipsis;
+    white-space: nowrap;
 }

 .umb-photo-folder .umb-non-thumbnail i{
@@ -410,7 +415,18 @@ ul.color-picker li a  {
  line-height: 60px;
  display: block;
  margin: auto;
-  padding-top: 20px;
+  /*vertically aligns */
+  position: relative;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.umb-photo-folder .umb-non-thumbnail span{
+  position: absolute;
+  display: block;
+  margin: auto;
+  width: 100%;
+  top: 20px;
 }

 .umb-photo-folder .selected{
@@ -505,4 +521,6 @@ ul.color-picker li a  {
 // --------------------------------------------------
 .bootstrap-datetimepicker-widget .btn{padding: 0;}
 .bootstrap-datetimepicker-widget .picker-switch .btn{ background: none; border: none;}
-.umb-datepicker .input-append .add-on{cursor: pointer;}
+.umb-datepicker .input-append .add-on{cursor: pointer;}
+.umb-datepicker p {margin-top:10px;}
+.umb-datepicker p a{color: @gray;}
--- a/Show More
+++ b/Show More