Bump version

Fixes U4-6665 (Localization Bug)

build/Build.bat

@@ -23,14 +23,15 @@ ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %rel
 
 ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise you'd have to run build.cmd twice
 SET nuGetFolder=%CD%\..\src\packages\
-..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore
+..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore >NUL
 ..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
 ..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
 ..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder%
 ..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder%
 
-ECHO Removing the belle build folder to make sure everything is clean as a whistle
+ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
 RD ..\src\Umbraco.Web.UI.Client\build /Q /S
+RD ..\src\Umbraco.Web.UI.Client\bower_components /Q /S
 
 ECHO Removing existing built files to make sure everything is clean as a whistle
 RMDIR /Q /S _BuildOutput
@@ -48,14 +49,12 @@ 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%
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoExamine.PDF.nuspec
                         
 IF ERRORLEVEL 1 GOTO :showerror
 

build/Build.proj

@@ -1,4 +1,3 @@
-
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- 
@@ -14,18 +13,18 @@
 
   <Import Project="..\tools\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
   <Import Project="..\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
- 
- <UsingTask TaskName="GenerateHash" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+
+  <UsingTask TaskName="GenerateHash" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
     <ParameterGroup>
-        <InputFiles ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
-        <OutputFile ParameterType="System.String" Required="true" />
+      <InputFiles ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
+      <OutputFile ParameterType="System.String" Required="true" />
     </ParameterGroup>
     <Task>
-        <Using Namespace="System.IO" />
-        <Using Namespace="System.Linq" />
-        <Using Namespace="System.Security.Cryptography" />
-        <Code Type="Fragment" Language="cs">
-            <![CDATA[
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Linq" />
+      <Using Namespace="System.Security.Cryptography" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
                 using (var ms = new MemoryStream())
                 {
                     foreach (var item in InputFiles)
@@ -48,11 +47,11 @@
                     }
                 }
             ]]>
-        </Code>
+      </Code>
     </Task>
- </UsingTask>
+  </UsingTask>
+
 
- 
   <!-- 
  ****************************************************
  VARIABLES 
@@ -76,23 +75,19 @@
     <BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
     <BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
     <BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
-    <BuildZipExaminePDFName>UmbracoExamine.PDF.0.6.0.zip</BuildZipExaminePDFName>
     <IncludeSymbols>False</IncludeSymbols>
     <BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
     <BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
     <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
     <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
     <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
-   <ConfigsFolder>$(BuildFolder)Configs\</ConfigsFolder>
+    <ConfigsFolder>$(BuildFolder)Configs\</ConfigsFolder>
     <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
     <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
     <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
     <WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
     <WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
     <WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
-    <ExaminePDFPath>$(BuildFolderAbsolutePath)UmbracoExamine.PDF\</ExaminePDFPath>
-    <ExamineAzurePath>$(BuildFolderAbsolutePath)UmbracoExamine.Azure\</ExamineAzurePath>
-    <ExaminePDFAzurePath>$(BuildFolderAbsolutePath)UmbracoExamine.PDF.Azure\</ExaminePDFAzurePath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -114,16 +109,16 @@
  *****************************************************
  -->
 
- <Target Name="Build" DependsOnTargets="GenerateWebPiHash">
+  <Target Name="Build" DependsOnTargets="GenerateWebPiHash">
     <Message Text="Build finished" />
- </Target>
- 
- <Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
-   <ItemGroup>
+  </Target>
+
+  <Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
+    <ItemGroup>
       <WebPiFile Include="$(BuildZipFileNameWebPi)" />
-   </ItemGroup>
-   <Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
-   <GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
+    </ItemGroup>
+    <Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
+    <GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
   </Target>
 
   <Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
@@ -150,10 +145,10 @@
         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="ZipUmbracoExaminePDF" >
+  <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
     <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
 
     <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
@@ -162,14 +157,6 @@
     <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
   </Target>
   
-  <Target Name="ZipUmbracoExaminePDF" DependsOnTargets="CreateSystemFolders" >
-    <Message Text="Starting to zip to $(buildDate)-$(BuildZipExaminePDFName)" Importance="high" />
-
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipExaminePDFName)%22 %22$(ExaminePDFPath)*%22" />
-
-    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipExaminePDFName)" Importance="high" />
-  </Target>
-
   <Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
     <MakeDir Directories="@(SystemFolders)" />
   </Target>
@@ -177,14 +164,14 @@
   <Target Name="CopyBelleBuild" DependsOnTargets="CopyLibraries" >
     <ItemGroup>
       <BelleFiles Include="..\src\Umbraco.Web.UI.Client\build\belle\**\*.*" Exclude="..\src\Umbraco.Web.UI.Client\build\belle\index.html" />
-    </ItemGroup>	
-	
-	<Copy SourceFiles="@(BelleFiles)"
-        DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
-        OverwriteReadOnlyFiles="true"
-        SkipUnchangedFiles="false" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(BelleFiles)"
+          DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
+          OverwriteReadOnlyFiles="true"
+          SkipUnchangedFiles="false" />
   </Target>
-  
+
   <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
     <!-- Copy SQL CE -->
     <ItemGroup>
@@ -217,7 +204,7 @@
   </Target>
 
   <!-- Copy the transformed web.config file to the root -->
- <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
+  <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
     <ItemGroup>
       <WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
     </ItemGroup>
@@ -226,24 +213,24 @@
         DestinationFiles="$(WebAppFolder)Web.config"
         OverwriteReadOnlyFiles="true"
         SkipUnchangedFiles="false" />
- </Target>
- 
- <!-- Copy the config files and rename them to *.config.transform -->
- <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
+  </Target>
+
+  <!-- Copy the config files and rename them to *.config.transform -->
+  <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
     <ItemGroup>
-     <ConfigFiles Include="$(WebAppFolder)config\*.config;$(WebAppFolder)config\*.js" />
-	 <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
-   </ItemGroup>
-   
-   <Copy SourceFiles="@(ConfigFiles)"
-       DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
-       OverwriteReadOnlyFiles="true"
-       SkipUnchangedFiles="false" />
-	   
-   <Copy SourceFiles="@(WebConfigTransformFile)"
-	   DestinationFiles="$(ConfigsFolder)Web.config.transform"
-	   OverwriteReadOnlyFiles="true"
-	   SkipUnchangedFiles="false" />
+      <ConfigFiles Include="$(WebAppFolder)config\*.config;$(WebAppFolder)config\*.js" />
+      <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(ConfigFiles)"
+        DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+
+    <Copy SourceFiles="@(WebConfigTransformFile)"
+      DestinationFiles="$(ConfigsFolder)Web.config.transform"
+      OverwriteReadOnlyFiles="true"
+      SkipUnchangedFiles="false" />
   </Target>
 
   <!-- Copy the xml documentation to the bin folder -->
@@ -261,78 +248,68 @@
 
   <!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
   <Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
-	<ItemGroup>
-		<PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
+    <ItemGroup>
+      <PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
     </ItemGroup>
-	<RemoveDir Directories="@(PresentationFolderToDelete)" />
+    <RemoveDir Directories="@(PresentationFolderToDelete)" />
   </Target>
 
-  <Target Name="CompileProjects" DependsOnTargets="CompileExternalExamineProjects">
-    
+  <Target Name="CompileProjects" DependsOnTargets="SetVersionNumber">
+
     <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
     <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
     <!-- Build the Umbraco.Web.UI project -->
     <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
     </MSBuild>
-    
+
     <!-- DONE -->
     <Message Text="Finished compiling projects" Importance="high" />
   </Target>
 
-  <Target Name="CompileExternalExamineProjects" DependsOnTargets="SetVersionNumber">
-    <Message Text="Building externally shipped examine projects" Importance="high" />
-
-    <!-- First remove old files from the examine builds -->
-    <ItemGroup>
-      <FilesToDeleteBeforeBuild Include="$(ExaminePDFPath)*;$(ExamineAzurePath)*"/>
-    </ItemGroup>
-    <Delete Files="@(FilesToDeleteBeforeBuild)" />
-    <!-- 
-      Build the UmbracoExamine.PDF.Azure library ... this builds the 3 projects that we want to bundle separately so no need to build each one separately .
-      We'll just build this one and then manually copy the DLLs to where we want them.
-    -->
-    <MSBuild Projects="..\src\UmbracoExamine.PDF.Azure\UmbracoExamine.PDF.Azure.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);PipelineDependsOnBuild=False;OutDir=$(ExaminePDFAzurePath);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
-    </MSBuild>
-    <ItemGroup>
-      <ExaminePDFFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.pdf;$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.xml;$(ExaminePDFAzurePath)**\itextsharp.dll" />
-      <ExamineAzureFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.pdb;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.xml" />
-      <ExaminePDFAzureFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.pdb;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.xml" />
-    </ItemGroup>
-    <!-- Now copy the built files to their correct deployment folders-->
-    <Copy SourceFiles="@(ExaminePDFFiles)"
-        DestinationFolder="$(ExaminePDFPath)"
-        OverwriteReadOnlyFiles="true"
-        SkipUnchangedFiles="false" />
-    <Copy SourceFiles="@(ExamineAzureFiles)"
-        DestinationFolder="$(ExamineAzurePath)"
-        OverwriteReadOnlyFiles="true"
-        SkipUnchangedFiles="false" />
-    <!-- Then just delete the files we don't want to ship in the UmbracoExamine.Azure.PDF folder -->
-    <ItemGroup>
-      <FilesToDeleteAfterBuild Include="$(ExaminePDFAzurePath)*" Exclude="$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.dll;$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.pdb;$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.xml"/>
-    </ItemGroup>
-    <Delete Files="@(FilesToDeleteAfterBuild)" />
-  </Target>
-
   <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
-	<PropertyGroup>
-		<NewVersion>$(BUILD_RELEASE)</NewVersion>
-		<NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
-	</PropertyGroup>
-	
-	<!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
+    <PropertyGroup>
+      <NewVersion>$(BUILD_RELEASE)</NewVersion>
+      <NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
+    </PropertyGroup>
+
+    <!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
     <FileUpdate
       Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
       Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?"
       ReplacementText="$(BUILD_RELEASE)"/>
 
     <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
-      Regex="CurrentComment { get { return &quot;([a-zA-Z]+)?&quot;"
+      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
       ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>
-	
-	<XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.props"
-             Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
-			 Query="//x:UmbracoVersion"
-			 Value="$(NewVersion)" />
+
+    <!--This updates the AssemblyFileVersion for the solution to the umbraco version-->
+    <FileUpdate
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyFileVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyFileVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
+
+    <!--This updates the AssemblyInformationalVersion for the solution to the umbraco version and comment-->
+    <FileUpdate 
+      Condition="'$(BUILD_COMMENT)'!=''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_COMMENT)&quot;)"/>
+    <FileUpdate 
+      Condition="'$(BUILD_COMMENT)'==''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
+    
+    <!--This updates the copyright year-->
+    <FileUpdate 
+      Condition="'$(BUILD_COMMENT)'==''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyCopyright\(&quot;Copyright © Umbraco (\d{4})&quot;\)"
+      ReplacementText="AssemblyCopyright(&quot;Copyright © Umbraco $([System.DateTime]::Now.ToString(`yyyy`))&quot;)"/>
+
+    <XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.props"
+               Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
+         Query="//x:UmbracoVersion"
+         Value="$(NewVersion)" />
   </Target>
 </Project>

build/NuSpecs/UmbracoCms.Core.AllBinaries.nuspec

@@ -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://umbraco.codeplex.com/license</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>

build/NuSpecs/UmbracoCms.Core.Symbols.nuspec

@@ -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://umbraco.codeplex.com/license</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>

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -6,7 +6,7 @@
     <title>Umbraco Cms Core Binaries</title>
     <authors>Umbraco HQ</authors>
     <owners>Umbraco HQ</owners>
-    <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+    <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>
@@ -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.6, 7.0.0)" />
       <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.8.2.1, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.8.3.1, 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.60, 1.0.0)" />
+      <dependency id="Examine" version="[0.1.63, 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>

build/NuSpecs/UmbracoCms.nuspec

@@ -6,7 +6,7 @@
     <title>Umbraco Cms</title>
     <authors>Umbraco HQ</authors>
     <owners>Umbraco HQ</owners>
-    <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+    <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>
@@ -34,6 +34,7 @@
     <file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
     <file src="tools\install.ps1" target="tools\install.ps1" />
     <file src="tools\Readme.txt" target="tools\Readme.txt" />
+    <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
     <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
     <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
     <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />

build/NuSpecs/UmbracoExamine.PDF.nuspec

@@ -5,7 +5,7 @@
     <version>0.7.0</version>
     <authors>Umbraco HQ</authors>
     <owners>Umbraco HQ</owners>
-    <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+    <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>

build/NuSpecs/tools/Readme.txt

@@ -8,21 +8,11 @@
                                                    
 ----------------------------------------------------
 
-A note about running Umbraco from Visual Studio.
-
 Don't forget to build!
 
 When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
 file (and config files in the config folder). 
 
-We've done our best to transform your configuration files but in case something is not quite right: remember we
-backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
-
-We've overwritten all the files in the Umbraco and Umbraco_Client folder, these have been backed up in 
-App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or 
-a package might have added. Only the existing files were overwritten. If you customized anything then make 
-sure to do a compare and merge with the NuGetBackup folder.
-
 This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 
 Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
 Publish this won't affect you.

build/NuSpecs/tools/ReadmeUpgrade.txt

@@ -0,0 +1,33 @@
+
+  _    _ __  __ ____  _____           _____ ____  
+ | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
+ | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
+ | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
+ | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
+  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
+                                                   
+----------------------------------------------------
+
+Don't forget to build!
+
+When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
+file (and config files in the config folder). 
+
+We've done our best to transform your configuration files but in case something is not quite right: remember we
+backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
+
+We've overwritten all the files in the Umbraco and Umbraco_Client folder, these have been backed up in 
+App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or 
+a package might have added. Only the existing files were overwritten. If you customized anything then make 
+sure to do a compare and merge with the NuGetBackup folder.
+
+This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 
+Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
+Publish this won't affect you.
+The following items will now be automatically included when creating a deploy package or publishing to the file 
+system: umbraco, umbraco_client, config\splashes and global.asax.
+
+Please read the release notes on our.umbraco.org:
+http://our.umbraco.org/contribute/releases
+
+- Umbraco

build/NuSpecs/tools/Web.config.install.xdt

@@ -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)" />

build/NuSpecs/tools/install.core.ps1

@@ -63,7 +63,6 @@ if ($project) {
 		if(Test-Path $umbracoBinFolder\MySql.Data.dll) { Remove-Item $umbracoBinFolder\MySql.Data.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }

build/NuSpecs/tools/install.ps1

@@ -47,93 +47,46 @@ if ($project) {
 		robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
 		robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
 	}
-	
-	$copyWebconfig = $false
 
-	# SJ - What can I say: big up for James Newton King for teaching us a hack for detecting if this is a new install vs. an upgrade!
-	# https://github.com/JamesNK/Newtonsoft.Json/pull/387 - would never have seen this without the controversial pull request..	
-	Try		
+	$copyWebconfig = $true
+	$destinationWebConfig = Join-Path $projectDestinationPath "Web.config"
+
+	if(Test-Path $destinationWebConfig) 
 	{
-		# see if user is installing from VS NuGet console		
-		# get reference to the window, the console host and the input history		
-		# copy web.config if "install-package UmbracoCms" was last input		
-		# this is in a try-catch as they might be using the regular NuGet dialog 
-		# instead of package manager console
-		
-		$dte2 = Get-Interface $dte ([EnvDTE80.DTE2])		
-
-		$consoleWindow = $(Get-VSComponentModel).GetService([NuGetConsole.IPowerConsoleWindow])		
+		Try 
+		{
+			[xml]$config = Get-Content $destinationWebConfig
 			
-		$props = $consoleWindow.GetType().GetProperties([System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)		
-			
-		$prop = $props | ? { $_.Name -eq "ActiveHostInfo" } | select -first 1
-			
-		$hostInfo = $prop.GetValue($consoleWindow)
-			
-		$history = $hostInfo.WpfConsole.InputHistory.History		
-			
-		$lastCommand = $history | select -last 1
-			
-		if ($lastCommand)		
-		{		
-			$lastCommand = $lastCommand.Trim().ToLower()		
-			if ($lastCommand.StartsWith("install-package") -and $lastCommand.Contains("umbracocms"))		
-			{		
-				$copyWebconfig = $true
+			$config.configuration.appSettings.ChildNodes | ForEach-Object { 
+				if($_.key -eq "umbracoConfigurationStatus") 
+				{
+					# The web.config has an umbraco-specific appSetting in it
+					# don't overwrite it and let config transforms do their thing
+					$copyWebconfig = $false 
+				}
 			}
-		}
+		} 
+		Catch { }
 	}
-	Catch { }
-	
-	Try		
-	{	
-		# user is installing from VS NuGet dialog		
-		# get reference to the window, then smart output console provider		
-		# copy web.config if messages in buffered console contains "installing...UmbracoCms" in last operation		
-		
-		$instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor [System.Reflection.BindingFlags]::NonPublic)		
-		$consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)		
-		
-		$instance = $instanceField.GetValue($null)		
-		
-		$consoleProvider = $consoleField.GetValue($instance)		
-			
-		$console = $consoleProvider.CreateOutputConsole($false)		
-		
-		$messagesField = $console.GetType().GetField("_messages", [System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)		
-			
-		$messages = $messagesField.GetValue($console)		
-	
-		$operations = $messages -split "=============================="		
-			
-		$lastOperation = $operations | select -last 1		
-			
-		if ($lastOperation)		
-		{		
-			$lastOperation = $lastOperation.ToLower()
-			$lines = $lastOperation -split "`r`n"
-			$installMatch = $lines | ? { $_.Contains("...umbracocms ") } | select -first 1
-			
-			if ($installMatch)		
-			{
-				$copyWebconfig = $true
-			}
-		}
-	} 
-	Catch { }
 	
 	if($copyWebconfig -eq $true) 
 	{
 		$packageWebConfigSource = Join-Path $rootPath "UmbracoFiles\Web.config"
-		$destinationWebConfig = Join-Path $projectDestinationPath "Web.config"
 		Copy-Item $packageWebConfigSource $destinationWebConfig -Force
-	}
+	} 
 
 	$installFolder = Join-Path $projectDestinationPath "Install"
 	if(Test-Path $installFolder) {
 		Remove-Item $installFolder -Force -Recurse -Confirm:$false
 	}
 	
-	# Open readme.txt file
-	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
+	# Open appropriate readme
+	if($copyWebconfig -eq $true)  
+	{
+		$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
+	} 
+	else 
+	{	
+		$DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt')
+	}
 }

build/UmbracoVersion.txt

@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.2.2
+7.2.6

docs/License.txt

@@ -1,13 +0,0 @@
-Umbraco CMS version 4.5 is licensed under the OSI approved MIT License:
-
-Copyright (c) 2007-2010 umbraco I/S.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Umbraco versions prior to 4.5 were licensed under a combination of MIT and a propriatary UI license.  The license history can be found here:
-http://umbraco.codeplex.com/license

docs/README.txt

@@ -1,33 +0,0 @@
-Umbraco - the simple, flexible and friendly ASP.NET CMS
-=======================================================
-For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 57.000 active websites including Heinz.com, Peugeot.com, NAIAS.com and Microsofts documentinteropinitiative.org website you can be sure that the technology is proven, stable and scales.
-
-More info at http://umbraco.com
-
-Exploring the repository
-========================
-Most contributors will work on their own fork and should pick the branch in which they need their fix. For more information see:
-http://our.umbraco.org/contribute/guidelines-for-core-contribution
-
-Exploring the source
-====================
-The Umbraco source code is never required for you to start building sites. If you are not using the source code for debugging purposes or to contribute to the source then please download the binaries listed at http://umbraco.codeplex.com
-
-With that said, the Umbraco solution can be opened in Visual Studio 2010 with SP1 installed or Visual Studio 2012.
-
-Contributing
-============
-Umbraco is Open Source which means you can contribute to make it great!
-Read all about it at http://our.umbraco.org/contribute
-
-Forums
-======
-We have a forum running on http://our.umbraco.org for friendly community support.
-
-Documentation
-=============
-Our documentation section provides help on installing and using Umbraco including API reference documentation: http://our.umbraco.org/documentation
-
-Submitting Issues
-=================
-Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our online guide at http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature

src/SolutionInfo.cs

@@ -1,8 +1,8 @@
-using System.Reflection;
+using System.Reflection;
 using System.Resources;
 
-[assembly: AssemblyCompany("umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2012")]
+[assembly: AssemblyCompany("Umbraco")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -10,3 +10,6 @@ using System.Resources;
 
 
 [assembly: AssemblyVersion("1.0.*")]
+
+[assembly: AssemblyFileVersion("7.2.6")]
+[assembly: AssemblyInformationalVersion("7.2.6")]

src/Umbraco.Core/ApplicationContext.cs

@@ -165,6 +165,8 @@ namespace Umbraco.Core
         /// </remarks>
         internal string OriginalRequestUrl { get; set; }
 
+	    private bool _versionsDifferenceReported;
+
         /// <summary>
         /// Checks if the version configured matches the assembly version
         /// </summary>
@@ -174,17 +176,19 @@ namespace Umbraco.Core
 			{
 				try
 				{
-					string configStatus = ConfigurationStatus;
-					string currentVersion = UmbracoVersion.Current.ToString(3);
+					var configStatus = ConfigurationStatus;
+					var currentVersion = UmbracoVersion.Current.ToString(3);
+				    var ok = configStatus == currentVersion;
 
-
-					if (currentVersion != configStatus)
+					if (ok == false && _versionsDifferenceReported == false)
 					{
-						LogHelper.Info<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
+                        // remember it's been reported so we don't flood the log
+                        // no thread-safety so there may be a few log entries, doesn't matter
+                        _versionsDifferenceReported = true;
+                        LogHelper.Info<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
 					}
 						
-
-					return (configStatus == currentVersion);
+					return ok;
 				}
 				catch
 				{

src/Umbraco.Core/AsyncLock.cs

@@ -0,0 +1,207 @@
+using System;
+using System.Runtime.ConstrainedExecution;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core
+{
+    // http://blogs.msdn.com/b/pfxteam/archive/2012/02/12/10266988.aspx
+    //
+    // notes:
+    // - 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;
+        private readonly Semaphore _semaphore2;
+        private readonly IDisposable _releaser;
+        private readonly Task<IDisposable> _releaserTask;
+
+        public AsyncLock()
+            : this (null)
+        { }
+
+        public AsyncLock(string name)
+        {
+            // WaitOne() waits until count > 0 then decrements count
+            // Release() increments count
+            // initial count: the initial count value
+            // maximum count: the max value of count, and then Release() throws
+
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                // anonymous semaphore
+                // use one unique releaser, that will not release the semaphore when finalized
+                // because the semaphore is destroyed anyway if the app goes down
+
+                _semaphore = new SemaphoreSlim(1, 1); // create a local (to the app domain) semaphore
+                _releaser = new SemaphoreSlimReleaser(_semaphore);
+                _releaserTask = Task.FromResult(_releaser);
+            }
+            else
+            {
+                // named semaphore
+                // use dedicated releasers, that will release the semaphore when finalized
+                // because the semaphore is system-wide and we cannot leak counts
+
+                _semaphore2 = new Semaphore(1, 1, name); // create a system-wide named semaphore
+            }
+        }
+
+        private IDisposable CreateReleaser()
+        {
+            // for anonymous semaphore, use the unique releaser, else create a new one
+            return _semaphore != null
+                ? _releaser // (IDisposable)new SemaphoreSlimReleaser(_semaphore)
+                : (IDisposable)new NamedSemaphoreReleaser(_semaphore2);
+        }
+
+        public Task<IDisposable> LockAsync()
+        {
+            var wait = _semaphore != null 
+                ? _semaphore.WaitAsync() 
+                : WaitOneAsync(_semaphore2);
+
+            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)
+                _semaphore.Wait();
+            else
+                _semaphore2.WaitOne();
+            return _releaser ?? CreateReleaser(); // anonymous vs named
+        }
+
+        public IDisposable Lock(int millisecondsTimeout)
+        {
+            var entered = _semaphore != null
+                ? _semaphore.Wait(millisecondsTimeout)
+                : _semaphore2.WaitOne(millisecondsTimeout);
+            if (entered == false)
+                throw new TimeoutException("Failed to enter the lock within timeout.");
+            return _releaser ?? CreateReleaser(); // anonymous vs named
+        }
+
+        // note - before making those classes some structs, read 
+        // about "impure methods" and mutating readonly structs...
+
+        private class NamedSemaphoreReleaser : CriticalFinalizerObject, IDisposable
+        {
+            private readonly Semaphore _semaphore;
+
+            internal NamedSemaphoreReleaser(Semaphore semaphore)
+            {
+                _semaphore = semaphore;
+            }
+
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
+            private void Dispose(bool disposing)
+            {
+                // critical
+                _semaphore.Release();
+            }
+
+            // we WANT to release the semaphore because it's a system object
+            // ie a critical non-managed resource - so we inherit from CriticalFinalizerObject
+            // which means that the finalizer "should" run in all situations
+
+            // however... that can fail with System.ObjectDisposedException because the
+            // underlying handle was closed... because we cannot guarantee that the semaphore
+            // is not gone already... unless we get a GCHandle = GCHandle.Alloc(_semaphore);
+            // which should keep it around and then we free the handle?
+
+            // so... I'm not sure this is safe really...
+
+            ~NamedSemaphoreReleaser()
+            {
+                Dispose(false);
+            }
+        }
+
+        private class SemaphoreSlimReleaser : IDisposable
+        {
+            private readonly SemaphoreSlim _semaphore;
+
+            internal SemaphoreSlimReleaser(SemaphoreSlim semaphore)
+            {
+                _semaphore = semaphore;
+            }
+
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
+            private void Dispose(bool disposing)
+            {
+                if (disposing)
+                {
+                    // normal
+                    _semaphore.Release();
+                }
+            }
+
+            ~SemaphoreSlimReleaser()
+            {
+                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;
+        }
+    }
+}

src/Umbraco.Core/Cache/CacheKeys.cs

@@ -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";
     }
 }

src/Umbraco.Core/Cache/CacheProviderExtensions.cs

@@ -8,7 +8,7 @@ namespace Umbraco.Core.Cache
     /// <summary>
     /// Extensions for strongly typed access
     /// </summary>
-    internal static class CacheProviderExtensions
+    public static class CacheProviderExtensions
     {
         public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
             string cacheKey,

src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs

@@ -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()

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -105,15 +105,22 @@ 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);
                     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

src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs

@@ -129,7 +129,7 @@ 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);
 
@@ -138,10 +138,17 @@ namespace Umbraco.Core.Cache
                 }
             }
 
-            // 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,7 +180,7 @@ 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)
 

src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs

@@ -19,29 +19,11 @@ namespace Umbraco.Core.Cache
         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();
-
         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;
-            }
-        }
-
         #region Clear
 
         public virtual void ClearAllCache()
@@ -72,7 +54,7 @@ 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);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
                         return value == null || value.GetType().ToString().InvariantEquals(typeName);
                     })
                     .Select(x => x.Key)
@@ -92,7 +74,7 @@ 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);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
                         return value == null || value.GetType() == typeOfT;
                     })
                     .Select(x => x.Key)
@@ -112,7 +94,7 @@ 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);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
                         if (value == null) return true;
                         return value.GetType() == typeOfT
                             && predicate(x.Key, (T) value);
@@ -161,7 +143,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 +158,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 +170,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)
@@ -205,9 +187,9 @@ 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();
@@ -215,7 +197,12 @@ namespace Umbraco.Core.Cache
                 }
             }
 
-            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,7 +214,7 @@ 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)
 

src/Umbraco.Core/Configuration/InnerTextConfigurationElement.cs

@@ -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;

src/Umbraco.Core/Configuration/UmbracoSettings/ContentErrorPageElement.cs

@@ -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; }
         }

src/Umbraco.Core/Configuration/UmbracoSettings/IContentErrorPage.cs

@@ -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; }
     }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs

@@ -6,6 +6,10 @@
 
         bool InternalRedirectPreservesTemplate { get; }
 
+        bool DisableAlternativeTemplates { get; }
+
+        bool DisableFindContentByIdPath { get; }
+
         string UrlProviderMode { get; }
     }
 

src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs

@@ -16,6 +16,17 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return (bool) base["internalRedirectPreservesTemplate"]; }
         }
 
+        [ConfigurationProperty("disableAlternativeTemplates", DefaultValue = "false")]
+        public bool DisableAlternativeTemplates
+        {
+            get { return (bool) base["disableAlternativeTemplates"]; }
+        }
+        [ConfigurationProperty("disableFindContentByIdPath", DefaultValue = "false")]
+        public bool DisableFindContentByIdPath
+        {
+            get { return (bool) base["disableFindContentByIdPath"]; }
+        }
+
         [ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
         public string UrlProviderMode
         {

src/Umbraco.Core/Configuration/UmbracoVersion.cs

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

src/Umbraco.Core/Constants-Conventions.cs

@@ -192,73 +192,64 @@ namespace Umbraco.Core
 		                {
 		                    {
 		                        Comments,
-		                        new PropertyType(PropertyEditors.TextboxMultipleAlias, DataTypeDatabaseType.Ntext, true)
+		                        new PropertyType(PropertyEditors.TextboxMultipleAlias, DataTypeDatabaseType.Ntext, true, Comments)
 		                            {
-		                                Alias = Comments,
 		                                Name = CommentsLabel
 		                            }
 		                    },
 		                    {
 		                        FailedPasswordAttempts,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Integer, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Integer, true, FailedPasswordAttempts)
 		                            {
-		                                Alias = FailedPasswordAttempts,
 		                                Name = FailedPasswordAttemptsLabel
 		                            }
 		                    },
 		                    {
 		                        IsApproved,
-		                        new PropertyType(PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, true)
+		                        new PropertyType(PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, true, IsApproved)
 		                            {
-		                                Alias = IsApproved,
 		                                Name = IsApprovedLabel
 		                            }
 		                    },
 		                    {
 		                        IsLockedOut,
-		                        new PropertyType(PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, true)
+		                        new PropertyType(PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, true, IsLockedOut)
 		                            {
-		                                Alias = IsLockedOut,
 		                                Name = IsLockedOutLabel
 		                            }
 		                    },
 		                    {
 		                        LastLockoutDate,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true, LastLockoutDate)
 		                            {
-		                                Alias = LastLockoutDate,
 		                                Name = LastLockoutDateLabel
 		                            }
 		                    },
 		                    {
 		                        LastLoginDate,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true, LastLoginDate)
 		                            {
-		                                Alias = LastLoginDate,
 		                                Name = LastLoginDateLabel
 		                            }
 		                    },
 		                    {
 		                        LastPasswordChangeDate,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true, LastPasswordChangeDate)
 		                            {
-		                                Alias = LastPasswordChangeDate,
 		                                Name = LastPasswordChangeDateLabel
 		                            }
 		                    },
 		                    {
 		                        PasswordAnswer,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Nvarchar, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Nvarchar, true, PasswordAnswer)
 		                            {
-		                                Alias = PasswordAnswer,
 		                                Name = PasswordAnswerLabel
 		                            }
 		                    },
 		                    {
 		                        PasswordQuestion,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Nvarchar, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Nvarchar, true, PasswordQuestion)
 		                            {
-		                                Alias = PasswordQuestion,
 		                                Name = PasswordQuestionLabel
 		                            }
 		                    }

src/Umbraco.Core/CoreBootManager.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Web;
 using AutoMapper;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.Models.PublishedContent;
@@ -21,6 +23,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Publishing;
 using Umbraco.Core.Macros;
+using Umbraco.Core.Manifest;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 using Umbraco.Core.Strings;
@@ -63,7 +66,7 @@ namespace Umbraco.Core
 
 	        InitializeProfilerResolver();
 
-            _timer = DisposableTimer.DebugDuration<CoreBootManager>("Umbraco application starting", "Umbraco application startup complete");
+            _timer = DisposableTimer.TraceDuration<CoreBootManager>("Umbraco application starting", "Umbraco application startup complete");
             
 	        CreateApplicationCache();
 
@@ -259,8 +262,12 @@ namespace Umbraco.Core
 		/// </summary>
 		protected virtual void InitializeResolvers()
 		{
-            PropertyEditorResolver.Current = new PropertyEditorResolver(() => PluginManager.Current.ResolvePropertyEditors());
-            ParameterEditorResolver.Current = new ParameterEditorResolver(() => PluginManager.Current.ResolveParameterEditors());
+            var builder = new ManifestBuilder(
+                ApplicationCache.RuntimeCache,
+                new ManifestParser(new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")), ApplicationCache.RuntimeCache));
+
+            PropertyEditorResolver.Current = new PropertyEditorResolver(() => PluginManager.Current.ResolvePropertyEditors(), builder);
+            ParameterEditorResolver.Current = new ParameterEditorResolver(() => PluginManager.Current.ResolveParameterEditors(), builder);
 
             //setup the validators resolver with our predefined validators
             ValidatorsResolver.Current = new ValidatorsResolver(new[]

src/Umbraco.Core/EnumerableExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -114,13 +115,7 @@ namespace Umbraco.Core
         /// <returns></returns>
         public static bool ContainsAll<TSource>(this IEnumerable<TSource> source, IEnumerable<TSource> other)
         {
-            var matches = true;
-            foreach (var i in other)
-            {
-                matches = source.Contains(i);
-                if (!matches) break;
-            }
-            return matches;
+            return other.Except(source).Any() == false;
         }
 
         /// <summary>
@@ -132,7 +127,7 @@ namespace Umbraco.Core
         /// <returns></returns>
         public static bool ContainsAny<TSource>(this IEnumerable<TSource> source, IEnumerable<TSource> other)
         {
-            return other.Any(i => source.Contains(i));
+            return other.Any(source.Contains);
         }
 
         /// <summary>
@@ -224,7 +219,7 @@ namespace Umbraco.Core
             return sequence.Select(
                 x =>
                 {
-                    if (typeof(TActual).IsAssignableFrom(x.GetType()))
+                    if (x is TActual)
                     {
                         var casted = x as TActual;
                         projection.Invoke(casted);
@@ -276,6 +271,34 @@ namespace Umbraco.Core
         ///<param name="items">The enumerable to search.</param>
         ///<param name="item">The item to find.</param>
         ///<returns>The index of the first matching item, or -1 if the item was not found.</returns>
-        public static int IndexOf<T>(this IEnumerable<T> items, T item) { return items.FindIndex(i => EqualityComparer<T>.Default.Equals(item, i)); }
+        public static int IndexOf<T>(this IEnumerable<T> items, T item)
+        {
+            return items.FindIndex(i => EqualityComparer<T>.Default.Equals(item, i));
+        }
+
+        /// <summary>
+        /// Determines if 2 lists have equal elements within them regardless of how they are sorted
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="source"></param>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The logic for this is taken from:
+        /// http://stackoverflow.com/questions/4576723/test-whether-two-ienumerablet-have-the-same-values-with-the-same-frequencies
+        /// 
+        /// There's a few answers, this one seems the best for it's simplicity and based on the comment of Eamon
+        /// </remarks>
+        public static bool UnsortedSequenceEqual<T>(this IEnumerable<T> source, IEnumerable<T> other)
+        {
+            if (source == null && other == null) return true;
+            if (source == null || other == null) return false;
+
+            var list1Groups = source.ToLookup(i => i);
+            var list2Groups = other.ToLookup(i => i);
+            return list1Groups.Count == list2Groups.Count
+               && list1Groups.All(g => g.Count() == list2Groups[g.Key].Count());
+        }
+
     }
 }

src/Umbraco.Core/HttpContextExtensions.cs

@@ -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);
+            }
+        }
+    }
+}

src/Umbraco.Core/Logging/LogHelper.cs

@@ -40,8 +40,8 @@ namespace Umbraco.Core.Logging
 		/// <returns></returns>
 		private static string PrefixThreadId(string generateMessageFormat)
 		{
-			return "[Thread " + Thread.CurrentThread.ManagedThreadId + "] " + generateMessageFormat;
-		}
+            return "[T" + Thread.CurrentThread.ManagedThreadId + "/D" + AppDomain.CurrentDomain.Id + "] " + generateMessageFormat;
+        }
 
 		#region Error
 		/// <summary>

src/Umbraco.Core/Macros/MacroTagParser.cs

@@ -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=[""']([\w\.]+?)[""'].+?)(?:/>|>.*?</\?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 | RegexOptions.Singleline);
 
 	    /// <summary>
 	    /// This formats the persisted string to something useful for the rte so that the macro renders properly since we 

src/Umbraco.Core/Manifest/GridEditorConverter.cs

@@ -0,0 +1,35 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.IO;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Serialization;
+
+namespace Umbraco.Core.Manifest
+{
+    /// <summary>
+    /// Ensures that virtual paths are taken care of
+    /// </summary>
+    internal class GridEditorConverter : JsonCreationConverter<GridEditor>
+    {
+        protected override GridEditor Create(Type objectType, JObject jObject)
+        {
+            return new GridEditor();
+        }
+
+        protected override void Deserialize(JObject jObject, GridEditor target, JsonSerializer serializer)
+        {
+            base.Deserialize(jObject, target, serializer);
+
+            if (target.View.IsNullOrWhiteSpace() == false && target.View.StartsWith("~/"))
+            {
+                target.View = IOHelper.ResolveUrl(target.View);
+            }
+
+            if (target.Render.IsNullOrWhiteSpace() == false && target.Render.StartsWith("~/"))
+            {
+                target.Render = IOHelper.ResolveUrl(target.Render);
+            }             
+        }
+    }
+}

src/Umbraco.Core/Manifest/ManifestBuilder.cs

@@ -1,6 +1,8 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
+using Umbraco.Core.Cache;
 using Umbraco.Core.IO;
 using Umbraco.Core.PropertyEditors;
 
@@ -11,73 +13,92 @@ namespace Umbraco.Core.Manifest
     /// </summary>
     internal class ManifestBuilder
     {
+        private readonly IRuntimeCacheProvider _cache;
+        private readonly ManifestParser _parser;
 
-        private static readonly ConcurrentDictionary<string, object> StaticCache = new ConcurrentDictionary<string, object>();
-        
-        private const string ManifestKey = "manifests";
+        public ManifestBuilder(IRuntimeCacheProvider cache, ManifestParser parser)
+        {
+            _cache = cache;
+            _parser = parser;
+        }
+
+        private const string GridEditorsKey = "grideditors";
         private const string PropertyEditorsKey = "propertyeditors";
         private const string ParameterEditorsKey = "parametereditors";
 
         /// <summary>
-        /// Returns all property editors found in the manfifests
+        /// Returns all grid editors found in the manfifests
         /// </summary>
-        internal static IEnumerable<PropertyEditor> PropertyEditors
+        internal IEnumerable<GridEditor> GridEditors
         {
             get
             {
-                return (IEnumerable<PropertyEditor>) StaticCache.GetOrAdd(
-                    PropertyEditorsKey,
-                    s =>
+                return _cache.GetCacheItem<IEnumerable<GridEditor>>(
+                    typeof (ManifestBuilder) + GridEditorsKey,
+                    () =>
+                    {
+                        var editors = new List<GridEditor>();
+                        foreach (var manifest in _parser.GetManifests())
                         {
-                            var editors = new List<PropertyEditor>();
-                            foreach (var manifest in GetManifests())
+                            if (manifest.GridEditors != null)
                             {
-                                if (manifest.PropertyEditors != null)
-                                {
-                                    editors.AddRange(ManifestParser.GetPropertyEditors(manifest.PropertyEditors));    
-                                }
-                                
+                                editors.AddRange(ManifestParser.GetGridEditors(manifest.GridEditors));
                             }
-                            return editors;
-                        });
+
+                        }
+                        return editors;
+                    }, new TimeSpan(0, 10, 0));
+            }
+        }
+
+        /// <summary>
+        /// Returns all property editors found in the manfifests
+        /// </summary>
+        internal IEnumerable<PropertyEditor> PropertyEditors
+        {
+            get
+            {
+                return _cache.GetCacheItem<IEnumerable<PropertyEditor>>(
+                    typeof(ManifestBuilder) + PropertyEditorsKey,
+                    () =>
+                    {
+                        var editors = new List<PropertyEditor>();
+                        foreach (var manifest in _parser.GetManifests())
+                        {
+                            if (manifest.PropertyEditors != null)
+                            {
+                                editors.AddRange(ManifestParser.GetPropertyEditors(manifest.PropertyEditors));
+                            }
+
+                        }
+                        return editors;
+                    }, new TimeSpan(0, 10, 0));
             }
         }
 
         /// <summary>
         /// Returns all parameter editors found in the manfifests and all property editors that are flagged to be parameter editors
         /// </summary>
-        internal static IEnumerable<ParameterEditor> ParameterEditors
+        internal IEnumerable<ParameterEditor> ParameterEditors
         {
             get
             {
-                return (IEnumerable<ParameterEditor>)StaticCache.GetOrAdd(
-                    ParameterEditorsKey,
-                    s =>
+                return _cache.GetCacheItem<IEnumerable<ParameterEditor>>(
+                    typeof (ManifestBuilder) + ParameterEditorsKey,
+                    () =>
                     {
                         var editors = new List<ParameterEditor>();
-                        foreach (var manifest in GetManifests())
+                        foreach (var manifest in _parser.GetManifests())
                         {
                             if (manifest.ParameterEditors != null)
                             {
-                                editors.AddRange(ManifestParser.GetParameterEditors(manifest.ParameterEditors));    
+                                editors.AddRange(ManifestParser.GetParameterEditors(manifest.ParameterEditors));
                             }
                         }
                         return editors;
-                    });
+                    }, new TimeSpan(0, 10, 0));
             }
         } 
-
-        /// <summary>
-        /// Ensures the manifests are found and loaded into memory
-        /// </summary>
-        private static IEnumerable<PackageManifest> GetManifests()
-        {
-            return (IEnumerable<PackageManifest>) StaticCache.GetOrAdd(ManifestKey, s =>
-                {
-                    var parser = new ManifestParser(new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")));
-                    return parser.GetManifests();
-                });
-        }
-
+        
     }
 }

src/Umbraco.Core/Manifest/ManifestParser.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Umbraco.Core.Cache;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
@@ -17,15 +18,29 @@ namespace Umbraco.Core.Manifest
     internal class ManifestParser
     {
         private readonly DirectoryInfo _pluginsDir;
-        
+        private readonly IRuntimeCacheProvider _cache;
+
         //used to strip comments
         private static readonly Regex CommentsSurround = new Regex(@"/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/", RegexOptions.Compiled);
-        private static readonly Regex CommentsLine = new Regex(@"//.*?$", RegexOptions.Compiled | RegexOptions.Multiline);
+        private static readonly Regex CommentsLine = new Regex(@"^\s*//.*?$", RegexOptions.Compiled | RegexOptions.Multiline);
 
-        public ManifestParser(DirectoryInfo pluginsDir)
+        public ManifestParser(DirectoryInfo pluginsDir, IRuntimeCacheProvider cache)
         {
             if (pluginsDir == null) throw new ArgumentNullException("pluginsDir");
             _pluginsDir = pluginsDir;
+            _cache = cache;
+        }
+
+        /// <summary>
+        /// Parse the grid editors from the json array
+        /// </summary>
+        /// <param name="jsonEditors"></param>
+        /// <returns></returns>
+        internal static IEnumerable<GridEditor> GetGridEditors(JArray jsonEditors)
+        {
+            return JsonConvert.DeserializeObject<IEnumerable<GridEditor>>(
+                jsonEditors.ToString(),
+                new GridEditorConverter());
         }
 
         /// <summary>
@@ -57,11 +72,17 @@ namespace Umbraco.Core.Manifest
         /// Get all registered manifests
         /// </summary>
         /// <returns></returns>
+        /// <remarks>
+        /// This ensures that we only build and look for all manifests once per Web app (based on the IRuntimeCache)
+        /// </remarks>
         public IEnumerable<PackageManifest> GetManifests()
         {
-            //get all Manifest.js files in the appropriate folders
-            var manifestFileContents = GetAllManifestFileContents(_pluginsDir);
-            return CreateManifests(manifestFileContents.ToArray());
+            return _cache.GetCacheItem<IEnumerable<PackageManifest>>(typeof (ManifestParser) + "GetManifests", () =>
+            {
+                //get all Manifest.js files in the appropriate folders
+                var manifestFileContents = GetAllManifestFileContents(_pluginsDir);
+                return CreateManifests(manifestFileContents.ToArray());
+            }, new TimeSpan(0, 10, 0));
         }
 
         /// <summary>
@@ -154,6 +175,20 @@ namespace Umbraco.Core.Manifest
                     throw new FormatException("The manifest is not formatted correctly contains more than one 'propertyEditors' element");
                 }
 
+                //validate the parameterEditors section
+                var paramEditors = deserialized.Properties().Where(x => x.Name == "parameterEditors").ToArray();
+                if (paramEditors.Length > 1)
+                {
+                    throw new FormatException("The manifest is not formatted correctly contains more than one 'parameterEditors' element");
+                }
+
+                //validate the gridEditors section
+                var gridEditors = deserialized.Properties().Where(x => x.Name == "gridEditors").ToArray();
+                if (gridEditors.Length > 1)
+                {
+                    throw new FormatException("The manifest is not formatted correctly contains more than one 'gridEditors' element");
+                }
+
                 var jConfig = init.Any() ? (JArray)deserialized["javascript"] : new JArray();
                 ReplaceVirtualPaths(jConfig);
 
@@ -175,13 +210,30 @@ namespace Umbraco.Core.Manifest
                         }
                     }
                 }
+
+                //replace virtual paths for each property editor
+                if (deserialized["gridEditors"] != null)
+                {
+                    foreach (JObject p in deserialized["gridEditors"])
+                    {
+                        if (p["view"] != null)
+                        {
+                            ReplaceVirtualPaths(p["view"]);
+                        }
+                        if (p["render"] != null)
+                        {
+                            ReplaceVirtualPaths(p["render"]);
+                        }
+                    }
+                }
                 
                 var manifest = new PackageManifest()
                     {
                         JavaScriptInitialize = jConfig,
                         StylesheetInitialize = cssConfig,
                         PropertyEditors = propEditors.Any() ? (JArray)deserialized["propertyEditors"] : new JArray(),
-                        ParameterEditors = propEditors.Any() ? (JArray)deserialized["parameterEditors"] : new JArray()
+                        ParameterEditors = paramEditors.Any() ? (JArray)deserialized["parameterEditors"] : new JArray(),
+                        GridEditors = gridEditors.Any() ? (JArray)deserialized["gridEditors"] : new JArray()
                     };
                 result.Add(manifest);
             }

src/Umbraco.Core/Manifest/PackageManifest.cs

@@ -26,5 +26,10 @@ namespace Umbraco.Core.Manifest
         /// The json array of parameter editors
         /// </summary>
         public JArray ParameterEditors { get; set; }
+
+        /// <summary>
+        /// The json array of grid editors
+        /// </summary>
+        public JArray GridEditors { get; set; }
     }
 }

src/Umbraco.Core/Models/Content.cs

@@ -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>
@@ -460,10 +393,14 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (Content)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to manually clone this since it's not settable
             clone._contentType = (IContentType)ContentType.DeepClone();
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
 

src/Umbraco.Core/Models/ContentBase.cs

@@ -436,7 +436,7 @@ namespace Umbraco.Core.Models
                 return;
             }
 
-            var propertyType = PropertyTypes.FirstOrDefault(x => x.Alias == propertyTypeAlias);
+            var propertyType = PropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (propertyType == null)
             {
                 throw new Exception(String.Format("No PropertyType exists with the supplied alias: {0}", propertyTypeAlias));
@@ -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
     }
 }

src/Umbraco.Core/Models/ContentExtensions.cs

@@ -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)

src/Umbraco.Core/Models/ContentType.cs

@@ -90,7 +90,11 @@ namespace Umbraco.Core.Models
                 {
                     _allowedTemplates = value;
                     return _allowedTemplates;
-                }, _allowedTemplates, AllowedTemplatesSelector);
+                }, _allowedTemplates, AllowedTemplatesSelector,
+                    //Custom comparer for enumerable
+                    new DelegateEqualityComparer<IEnumerable<ITemplate>>(
+                        (templates, enumerable) => templates.UnsortedSequenceEqual(enumerable),
+                        templates => templates.GetHashCode()));
             }
         }
 

src/Umbraco.Core/Models/ContentTypeBase.cs

@@ -351,7 +351,11 @@ namespace Umbraco.Core.Models
                 {
                     _allowedContentTypes = value;
                     return _allowedContentTypes;
-                }, _allowedContentTypes, AllowedContentTypesSelector);
+                }, _allowedContentTypes, AllowedContentTypesSelector,
+                    //Custom comparer for enumerable
+                    new DelegateEqualityComparer<IEnumerable<ContentTypeSort>>(
+                        (sorts, enumerable) => sorts.UnsortedSequenceEqual(enumerable),
+                        sorts => sorts.GetHashCode()));
             }
         }
 
@@ -609,13 +613,18 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (ContentTypeBase)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to manually wire up the event handlers for the property type collections - we've ensured
             // its ignored from the auto-clone process because its return values are unions, not raw and 
             // we end up with duplicates, see: http://issues.umbraco.org/issue/U4-4842
 
             clone._propertyTypes = (PropertyTypeCollection)_propertyTypes.DeepClone();
             clone._propertyTypes.CollectionChanged += clone.PropertyTypesChanged;
+            //this shouldn't really be needed since we're not tracking
+            clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
         }

src/Umbraco.Core/Models/ContentTypeCompositionBase.cs

@@ -255,11 +255,15 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (ContentTypeCompositionBase)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to manually assign since this is an internal field and will not be automatically mapped
             clone.RemovedContentTypeKeyTracker = new List<int>();
             clone._contentTypeComposition = ContentTypeComposition.Select(x => (IContentTypeComposition)x.DeepClone()).ToList();
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
         }

src/Umbraco.Core/Models/ContentTypeSort.cs

@@ -8,10 +8,20 @@ namespace Umbraco.Core.Models
     /// </summary>
     public class ContentTypeSort : IValueObject, IDeepCloneable
     {
+        [Obsolete("This parameterless constructor should never be used")]
         public ContentTypeSort()
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:System.Object"/> class.
+        /// </summary>
+        public ContentTypeSort(int id, int sortOrder)
+        {
+            Id = new Lazy<int>(() => id);
+            SortOrder = sortOrder;
+        }
+
         public ContentTypeSort(Lazy<int> id, int sortOrder, string @alias)
         {
             Id = id;
@@ -45,7 +55,7 @@ namespace Umbraco.Core.Models
 
         protected bool Equals(ContentTypeSort other)
         {
-            return Id.Value.Equals(other.Id.Value) && string.Equals(Alias, other.Alias);
+            return Id.Value.Equals(other.Id.Value) && string.Equals(Alias, other.Alias);    
         }
 
         public override bool Equals(object obj)
@@ -60,7 +70,9 @@ namespace Umbraco.Core.Models
         {
             unchecked
             {
-                return (Id.GetHashCode()*397) ^ Alias.GetHashCode();
+                //The hash code will just be the alias if one is assigned, otherwise it will be the hash code of the Id.
+                //In some cases the alias can be null of the non lazy ctor is used, in that case, the lazy Id will already have a value created.
+                return Alias != null ? Alias.GetHashCode() : (Id.Value.GetHashCode() * 397);
             }
         }
 

src/Umbraco.Core/Models/DictionaryItem.cs

@@ -80,7 +80,11 @@ namespace Umbraco.Core.Models
                 {
                     _translations = value;
                     return _translations;
-                }, _translations, TranslationsSelector);
+                }, _translations, TranslationsSelector,
+                    //Custom comparer for enumerable
+                    new DelegateEqualityComparer<IEnumerable<IDictionaryTranslation>>(
+                        (enumerable, translations) => enumerable.UnsortedSequenceEqual(translations),
+                        enumerable => enumerable.GetHashCode()));
             }
         }
 

src/Umbraco.Core/Models/EntityBase/Entity.cs

@@ -17,7 +17,6 @@ namespace Umbraco.Core.Models.EntityBase
     public abstract class Entity : TracksChangesEntityBase, IEntity, IRememberBeingDirty, ICanBeDirty
     {
         private bool _hasIdentity;
-        private int? _hash;
         private int _id;
         private Guid _key;
         private DateTime _createDate;
@@ -175,6 +174,7 @@ namespace Umbraco.Core.Models.EntityBase
             }
         }
 
+        //TODO: Make this NOT virtual or even exist really!
         public virtual bool SameIdentityAs(IEntity other)
         {
             if (ReferenceEquals(null, other))
@@ -195,11 +195,13 @@ namespace Umbraco.Core.Models.EntityBase
             return SameIdentityAs(other);
         }
 
+        //TODO: Make this NOT virtual or even exist really!
         public virtual Type GetRealType()
         {
             return GetType();
         }
 
+        //TODO: Make this NOT virtual or even exist really!
         public virtual bool SameIdentityAs(Entity other)
         {
             if (ReferenceEquals(null, other))
@@ -226,9 +228,13 @@ namespace Umbraco.Core.Models.EntityBase
 
         public override int GetHashCode()
         {
-            if (!_hash.HasValue)
-                _hash = !HasIdentity ? new int?(base.GetHashCode()) : new int?(Id.GetHashCode() * 397 ^ GetType().GetHashCode());
-            return _hash.Value;
+            unchecked
+            {
+                var hashCode = HasIdentity.GetHashCode();
+                hashCode = (hashCode * 397) ^ Id;
+                hashCode = (hashCode * 397) ^ GetType().GetHashCode();
+                return hashCode;
+            }
         }
 
         public virtual object DeepClone()
@@ -236,9 +242,17 @@ namespace Umbraco.Core.Models.EntityBase
             //Memberwise clone on Entity will work since it doesn't have any deep elements
             // for any sub class this will work for standard properties as well that aren't complex object's themselves.
             var clone = (Entity)MemberwiseClone();
+            //ensure the clone has it's own dictionaries
+            clone.ResetChangeTrackingCollections();
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //Automatically deep clone ref properties that are IDeepCloneable
             DeepCloneHelper.DeepCloneRefProperties(this, clone);
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
+
             return clone;
         }
     }

src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -18,7 +19,9 @@ namespace Umbraco.Core.Models.EntityBase
         public virtual IEnumerable<string> GetDirtyProperties()
         {
             return _propertyChangedInfo.Where(x => x.Value).Select(x => x.Key);
-        } 
+        }
+
+        private bool _changeTrackingEnabled = true;
 
         /// <summary>
         /// Tracks the properties that have changed
@@ -41,6 +44,9 @@ namespace Umbraco.Core.Models.EntityBase
         /// <param name="propertyInfo">The property info.</param>
         protected virtual void OnPropertyChanged(PropertyInfo propertyInfo)
         {
+            //return if we're not tracking changes
+            if (_changeTrackingEnabled == false) return;
+
             _propertyChangedInfo[propertyInfo.Name] = true;
 
             if (PropertyChanged != null)
@@ -72,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();
         }
@@ -132,6 +138,22 @@ namespace Umbraco.Core.Models.EntityBase
             _propertyChangedInfo = new Dictionary<string, bool>();
         }
 
+        protected void ResetChangeTrackingCollections()
+        {
+            _propertyChangedInfo = new Dictionary<string, bool>();
+            _lastPropertyChangedInfo = new Dictionary<string, bool>();
+        }
+
+        protected void DisableChangeTracking()
+        {
+            _changeTrackingEnabled = false;
+        }
+
+        protected void EnableChangeTracking()
+        {
+            _changeTrackingEnabled = true;
+        }
+
         /// <summary>
         /// Used by inheritors to set the value of properties, this will detect if the property value actually changed and if it did
         /// it will ensure that the property has a dirty flag set.
@@ -145,17 +167,51 @@ namespace Umbraco.Core.Models.EntityBase
         /// save a document type, nearly all properties are flagged as dirty just because we've 'reset' them, but they are all set 
         /// to the same value, so it's really not dirty.
         /// </remarks>
-        internal virtual bool SetPropertyValueAndDetectChanges<T>(Func<T, T> setValue, T value, PropertyInfo propertySelector)
+        internal bool SetPropertyValueAndDetectChanges<T>(Func<T, T> setValue, T value, PropertyInfo propertySelector)
+        {
+            if ((typeof(T) == typeof(string) == false) && TypeHelper.IsTypeAssignableFrom<IEnumerable>(typeof(T)))
+            {
+                throw new InvalidOperationException("This method does not support IEnumerable instances. For IEnumerable instances a manual custom equality check will be required");
+            }
+
+            return SetPropertyValueAndDetectChanges(setValue, value, propertySelector,
+                new DelegateEqualityComparer<T>(
+                    //Standard Equals comparison
+                    (arg1, arg2) => Equals(arg1, arg2),
+                    arg => arg.GetHashCode()));
+
+        }
+
+        /// <summary>
+        /// Used by inheritors to set the value of properties, this will detect if the property value actually changed and if it did
+        /// it will ensure that the property has a dirty flag set.
+        /// </summary>
+        /// <param name="setValue"></param>
+        /// <param name="value"></param>
+        /// <param name="propertySelector"></param>
+        /// <param name="comparer">The equality comparer to use</param>
+        /// <returns>returns true if the value changed</returns>
+        /// <remarks>
+        /// This is required because we don't want a property to show up as "dirty" if the value is the same. For example, when we 
+        /// save a document type, nearly all properties are flagged as dirty just because we've 'reset' them, but they are all set 
+        /// to the same value, so it's really not dirty.
+        /// </remarks>
+        internal bool SetPropertyValueAndDetectChanges<T>(Func<T, T> setValue, T value, PropertyInfo propertySelector, IEqualityComparer<T> comparer)
         {
             var initVal = value;
             var newVal = setValue(value);
 
-            if (Equals(initVal, newVal) == false)
+            //don't track changes, just set the value (above)
+            if (_changeTrackingEnabled == false) return false;
+
+            if (comparer.Equals(initVal, newVal) == false)
             {
                 OnPropertyChanged(propertySelector);
                 return true;
             }
             return false;
         }
+
+
     }
 }

src/Umbraco.Core/Models/File.cs

@@ -113,12 +113,15 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (File)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to manually assign since they are readonly properties
             clone._alias = Alias;
             clone._name = Name;
-
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
         }

src/Umbraco.Core/Models/Macro.cs

@@ -399,14 +399,17 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (Macro)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             clone._addedProperties = new List<string>();
             clone._removedProperties = new List<string>();
             clone._properties = (MacroPropertyCollection)Properties.DeepClone();
             //re-assign the event handler
             clone._properties.CollectionChanged += clone.PropertiesChanged;
-
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
         }

src/Umbraco.Core/Models/Member.cs

@@ -617,10 +617,14 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (Member)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to manually clone this since it's not settable
             clone._contentType = (IMemberType)ContentType.DeepClone();
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
 

src/Umbraco.Core/Models/Membership/IUser.cs

@@ -20,7 +20,8 @@ namespace Umbraco.Core.Models.Membership
         /// Gets/sets the user type for the user
         /// </summary>
         IUserType UserType { get; set; }
-        
+
+        //TODO: This should be a private set 
         /// <summary>
         /// The default permission set for the user
         /// </summary>

src/Umbraco.Core/Models/Membership/User.cs

@@ -27,7 +27,7 @@ namespace Umbraco.Core.Models.Membership
             if (userType == null) throw new ArgumentNullException("userType");
 
             _userType = userType;
-            _defaultPermissions = _userType.Permissions;
+            _defaultPermissions = _userType.Permissions == null ? Enumerable.Empty<string>() : new List<string>(_userType.Permissions);
             //Groups = new List<object> { userType };
             SessionTimeout = 60;
             _sectionCollection = new ObservableCollection<string>();
@@ -71,7 +71,9 @@ namespace Umbraco.Core.Models.Membership
         private bool _isApproved;
         private bool _isLockedOut;
         private string _language;
-        private IEnumerable<string> _defaultPermissions;
+
+        private IEnumerable<string> _defaultPermissions; 
+        
         private bool _defaultToLiveEditing;
 
         private static readonly PropertyInfo SessionTimeoutSelector = ExpressionHelper.GetPropertyInfo<User, int>(x => x.SessionTimeout);
@@ -86,7 +88,7 @@ namespace Umbraco.Core.Models.Membership
         private static readonly PropertyInfo IsLockedOutSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.IsLockedOut);
         private static readonly PropertyInfo IsApprovedSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.IsApproved);
         private static readonly PropertyInfo LanguageSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Language);
-        private static readonly PropertyInfo DefaultPermissionsSelector = ExpressionHelper.GetPropertyInfo<User, IEnumerable<string>>(x => x.DefaultPermissions);
+
         private static readonly PropertyInfo DefaultToLiveEditingSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.DefaultToLiveEditing);
         private static readonly PropertyInfo UserTypeSelector = ExpressionHelper.GetPropertyInfo<User, IUserType>(x => x.UserType);
         
@@ -319,19 +321,13 @@ namespace Umbraco.Core.Models.Membership
                 }, _language, LanguageSelector);
             }
         }
-        
+
+        //TODO: This should be a private set
         [DataMember]
         public IEnumerable<string> DefaultPermissions
         {
-            get { return _defaultPermissions; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _defaultPermissions = value;
-                    return _defaultPermissions;
-                }, _defaultPermissions, DefaultPermissionsSelector);
-            }
+            get {  return _defaultPermissions;}
+            set { _defaultPermissions = value; }
         }
 
         [IgnoreDataMember]
@@ -415,15 +411,19 @@ namespace Umbraco.Core.Models.Membership
         public override object DeepClone()
         {
             var clone = (User)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to create new collections otherwise they'll get copied by ref
             clone._addedSections = new List<string>();
             clone._removedSections = new List<string>();
             clone._sectionCollection = new ObservableCollection<string>(_sectionCollection.ToList());
+            clone._defaultPermissions = new List<string>(_defaultPermissions.ToList());
             //re-create the event handler
             clone._sectionCollection.CollectionChanged += clone.SectionCollectionChanged;
-
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
         }

src/Umbraco.Core/Models/Membership/UserType.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
@@ -67,7 +68,11 @@ namespace Umbraco.Core.Models.Membership
                 {
                     _permissions = value;
                     return _permissions;
-                }, _permissions, PermissionsSelector);
+                }, _permissions, PermissionsSelector,
+                    //Custom comparer for enumerable
+                    new DelegateEqualityComparer<IEnumerable<string>>(
+                        (enum1, enum2) => enum1.UnsortedSequenceEqual(enum2),
+                        enum1 => enum1.GetHashCode()));
             }
         }
     }

src/Umbraco.Core/Models/Property.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
@@ -120,7 +123,7 @@ namespace Umbraco.Core.Models
             {
                 bool typeValidation = _propertyType.IsPropertyTypeValid(value);
 
-                if (!typeValidation)
+                if (typeValidation == false)
                     throw new Exception(
                         string.Format(
                             "Type validation failed. The value type: '{0}' does not match the DataType in PropertyType with alias: '{1}'",
@@ -130,7 +133,21 @@ namespace Umbraco.Core.Models
                 {
                     _value = value;
                     return _value;
-                }, _value, ValueSelector);
+                }, _value, ValueSelector, 
+                new DelegateEqualityComparer<object>(
+                    (o, o1) =>
+                    {
+                        //Custom comparer for enumerable if it is enumerable
+                        if (o == null && o1 == null) return true;
+                        if (o == null || o1 == null) return false;
+                        var enum1 = o as IEnumerable;
+                        var enum2 = o1 as IEnumerable;
+                        if (enum1 != null && enum2 != null)
+                        {
+                            return enum1.Cast<object>().UnsortedSequenceEqual(enum2.Cast<object>());
+                        }
+                        return o.Equals(o1);
+                    }, o => o.GetHashCode()));
             }
         }
 
@@ -160,10 +177,14 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (Property)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to manually assign since this is a readonly property
             clone._propertyType = (PropertyType)PropertyType.DeepClone();
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
             
             return clone;
         }

src/Umbraco.Core/Models/PropertyCollection.cs

@@ -16,12 +16,14 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class PropertyCollection : KeyedCollection<string, Property>, INotifyCollectionChanged, IDeepCloneable
     {
-        private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();
+        private readonly object _addLocker = new object();
         internal Action OnAdd;
         internal Func<Property, bool> ValidateAdd { get; set; }
 
         internal PropertyCollection()
-        {}
+            : base(StringComparer.InvariantCultureIgnoreCase)
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PropertyCollection"/> class with a delegate responsible for validating the addition of <see cref="Property"/> instances.
@@ -29,11 +31,13 @@ namespace Umbraco.Core.Models
         /// <param name="validationCallback">The validation callback.</param>
         /// <remarks></remarks>
         internal PropertyCollection(Func<Property, bool> validationCallback)
+            : this()
         {
             ValidateAdd = validationCallback;
         }
 
         public PropertyCollection(IEnumerable<Property> properties)
+            : this()
         {
             Reset(properties);
         }
@@ -78,7 +82,7 @@ namespace Umbraco.Core.Models
 
         internal new void Add(Property item)
         {
-            using (new WriteLock(_addLocker))
+            lock (_addLocker)
             {
                 var key = GetKeyForItem(item);
                 if (key != null)
@@ -113,14 +117,14 @@ namespace Umbraco.Core.Models
         /// <remarks></remarks>
         public new bool Contains(string propertyTypeAlias)
         {
-            return this.Any(x => x.Alias == propertyTypeAlias);
+            return base.Contains(propertyTypeAlias);
         }
 
         public int IndexOfKey(string key)
         {
             for (var i = 0; i < this.Count; i++)
             {
-                if (this[i].Alias == key)
+                if (this[i].Alias.InvariantEquals(key))
                 {
                     return i;
                 }
@@ -145,7 +149,7 @@ namespace Umbraco.Core.Models
         {
             get
             {
-                return this.FirstOrDefault(x => x.Alias == propertyType.Alias);
+                return this.FirstOrDefault(x => x.Alias.InvariantEquals(propertyType.Alias));
             }
         }
 
@@ -165,7 +169,7 @@ namespace Umbraco.Core.Models
         /// <param name="propertyTypes">List of PropertyType</param>
         protected internal void EnsurePropertyTypes(IEnumerable<PropertyType> propertyTypes)
         {
-            if(/*!this.Any() &&*/ propertyTypes != null)
+            if (/*!this.Any() &&*/ propertyTypes != null)
             {
                 foreach (var propertyType in propertyTypes)
                 {
@@ -180,7 +184,7 @@ namespace Umbraco.Core.Models
         /// <param name="propertyTypes">List of PropertyType</param>
         protected internal void EnsureCleanPropertyTypes(IEnumerable<PropertyType> propertyTypes)
         {
-            if(propertyTypes != null)
+            if (propertyTypes != null)
             {
                 //Remove PropertyTypes that doesn't exist in the list of new PropertyTypes
                 var aliases = this.Select(p => p.Alias).Except(propertyTypes.Select(x => x.Alias)).ToList();

src/Umbraco.Core/Models/PropertyGroup.cs

@@ -120,27 +120,22 @@ namespace Umbraco.Core.Models
 
         public bool Equals(PropertyGroup other)
         {
-            //Check whether the compared object is null. 
-            if (Object.ReferenceEquals(other, null)) return false;
-
-            //Check whether the compared object references the same data. 
-            if (Object.ReferenceEquals(this, other)) return true;
+            if (base.Equals(other)) return true;
 
             //Check whether the PropertyGroup's properties are equal. 
-            return Id.Equals(other.Id) && Name.Equals(other.Name);
+            return Name.InvariantEquals(other.Name);
         }
 
         public override int GetHashCode()
         {
-
             //Get hash code for the Name field if it is not null. 
-            int hashName = Name == null ? 0 : Name.GetHashCode();
+            int baseHash = base.GetHashCode();
 
-            //Get hash code for the Id field. 
-            int hashId = Id.GetHashCode();
+            //Get hash code for the Alias field. 
+            int nameHash = Name.ToLowerInvariant().GetHashCode();
 
             //Calculate the hash code for the product. 
-            return hashName ^ hashId;
+            return baseHash ^ nameHash;
         }
 
     }

src/Umbraco.Core/Models/PropertyType.cs

@@ -38,11 +38,21 @@ namespace Umbraco.Core.Models
             _propertyEditorAlias = dataTypeDefinition.PropertyEditorAlias;
             _dataTypeDatabaseType = dataTypeDefinition.DatabaseType;
         }
+
+        public PropertyType(IDataTypeDefinition dataTypeDefinition, string propertyTypeAlias)
+            : this(dataTypeDefinition)
+        {
+            SetAlias(propertyTypeAlias);
+        }
         
-        internal PropertyType(string propertyEditorAlias, DataTypeDatabaseType dataTypeDatabaseType)
+        public PropertyType(string propertyEditorAlias, DataTypeDatabaseType dataTypeDatabaseType)
             : this(propertyEditorAlias, dataTypeDatabaseType, false)
         {
-            PropertyEditorAlias = propertyEditorAlias;
+        }
+
+        public PropertyType(string propertyEditorAlias, DataTypeDatabaseType dataTypeDatabaseType, string propertyTypeAlias)
+            : this(propertyEditorAlias, dataTypeDatabaseType, false, propertyTypeAlias)
+        {           
         }
 
         /// <summary>
@@ -58,6 +68,21 @@ namespace Umbraco.Core.Models
             _dataTypeDatabaseType = dataTypeDatabaseType;
         }
 
+        /// <summary>
+        /// Used internally to assign an explicity database type for this property type regardless of what the underlying data type/property editor is.
+        /// </summary>
+        /// <param name="propertyEditorAlias"></param>
+        /// <param name="dataTypeDatabaseType"></param>
+        /// <param name="isExplicitDbType"></param>
+        /// <param name="propertyTypeAlias"></param>
+        internal PropertyType(string propertyEditorAlias, DataTypeDatabaseType dataTypeDatabaseType, bool isExplicitDbType, string propertyTypeAlias)
+        {
+            _isExplicitDbType = isExplicitDbType;
+            _propertyEditorAlias = propertyEditorAlias;
+            _dataTypeDatabaseType = dataTypeDatabaseType;
+            SetAlias(propertyTypeAlias);
+        }
+
         private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.Name);
         private static readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.Alias);
         private static readonly PropertyInfo DescriptionSelector = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.Description);
@@ -96,15 +121,9 @@ namespace Umbraco.Core.Models
             get { return _alias; }
             set
             {
-                //NOTE: WE are doing this because we don't want to do a ToSafeAlias when the alias is the special case of
-                // being prefixed with Constants.PropertyEditors.InternalGenericPropertiesPrefix
-                // which is used internally
-
                 SetPropertyValueAndDetectChanges(o =>
                 {
-                    _alias = value.StartsWith(Constants.PropertyEditors.InternalGenericPropertiesPrefix)
-                        ? value 
-                        : value.ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase);
+                    SetAlias(value);
                     return _alias;
                 }, _alias, AliasSelector);
             }
@@ -284,6 +303,17 @@ namespace Umbraco.Core.Models
             }
         }
 
+        private void SetAlias(string value)
+        {
+            //NOTE: WE are doing this because we don't want to do a ToSafeAlias when the alias is the special case of
+            // being prefixed with Constants.PropertyEditors.InternalGenericPropertiesPrefix
+            // which is used internally
+
+            _alias = value.StartsWith(Constants.PropertyEditors.InternalGenericPropertiesPrefix)
+                        ? value
+                        : value.ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase);
+        }
+
         /// <summary>
         /// Create a new Property object from a "raw" database value.
         /// </summary>
@@ -431,39 +461,38 @@ namespace Umbraco.Core.Models
 
         public bool Equals(PropertyType other)
         {
-            //Check whether the compared object is null. 
-            if (ReferenceEquals(other, null)) return false;
-
-            //Check whether the compared object references the same data. 
-            if (ReferenceEquals(this, other)) return true;
+            if (base.Equals(other)) return true;
 
             //Check whether the PropertyType's properties are equal. 
-            return Alias.Equals(other.Alias) && Name.Equals(other.Name);
+            return Alias.InvariantEquals(other.Alias);
         }
 
         public override int GetHashCode()
         {
             //Get hash code for the Name field if it is not null. 
-            int hashName = Name == null ? 0 : Name.GetHashCode();
+            int baseHash = base.GetHashCode();
 
             //Get hash code for the Alias field. 
-            int hashAlias = Alias.GetHashCode();
+            int hashAlias = Alias.ToLowerInvariant().GetHashCode();
 
             //Calculate the hash code for the product. 
-            return hashName ^ hashAlias;
+            return baseHash ^ hashAlias;
         }
 
         public override object DeepClone()
         {
             var clone = (PropertyType)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to manually assign the Lazy value as it will not be automatically mapped
             if (PropertyGroupId != null)
             {
                 clone._propertyGroupId = new Lazy<int>(() => PropertyGroupId.Value);    
             }
-
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
         }

src/Umbraco.Core/Models/Template.cs

@@ -193,12 +193,15 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (Template)base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //need to manually assign since they are readonly properties
             clone._alias = Alias;
             clone._name = Name;
-
+            //this shouldn't really be needed since we're not tracking
             clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
 
             return clone;
         }

src/Umbraco.Core/Models/UmbracoEntity.cs

@@ -288,7 +288,8 @@ namespace Umbraco.Core.Models
         public override object DeepClone()
         {
             var clone = (UmbracoEntity) base.DeepClone();
-
+            //turn off change tracking
+            clone.DisableChangeTracking();
             //This ensures that any value in the dictionary that is deep cloneable is cloned too
             foreach (var key in clone.AdditionalData.Keys.ToArray())
             {
@@ -298,7 +299,10 @@ namespace Umbraco.Core.Models
                     clone.AdditionalData[key] = deepCloneable.DeepClone();
                 }
             }
-
+            //this shouldn't really be needed since we're not tracking
+            clone.ResetDirtyProperties(false);
+            //re-enable tracking
+            clone.EnableChangeTracking();
             return clone;
         }
 

src/Umbraco.Core/Models/UserExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Linq;
+using System.Threading;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 
@@ -23,13 +24,21 @@ namespace Umbraco.Core.Models
 
         internal static CultureInfo GetUserCulture(string userLanguage, ILocalizedTextService textService)
         {
-            return textService.GetSupportedCultures()
-                .FirstOrDefault(culture =>
-                    //match on full name first
-                    culture.Name.InvariantEquals(userLanguage.Replace("_", "-")) ||
-                        //then match on the 2 letter name
-                    culture.TwoLetterISOLanguageName.InvariantEquals(userLanguage));
-        } 
+            try
+            {
+                var culture = CultureInfo.GetCultureInfo(userLanguage.Replace("_", "-"));
+                //TODO: This is a hack because we store the user language as 2 chars instead of the full culture 
+                // which is actually stored in the language files (which are also named with 2 chars!) so we need to attempt
+                // to convert to a supported full culture
+                var result = textService.ConvertToSupportedCultureWithRegionCode(culture);
+                return result;
+            }
+            catch (CultureNotFoundException)
+            {
+                //return the default one
+                return CultureInfo.GetCultureInfo("en");
+            }
+        }
 
         /// <summary>
         /// Checks if the user has access to the content item based on their start noe

src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs

@@ -105,9 +105,9 @@ namespace Umbraco.Core.Persistence.Factories
                         propDbType.Result,
                         //This flag tells the property type that it has an explicit dbtype and that it cannot be changed
                         // which is what we want for the built-in properties.
-                        propDbType.Success)
+                        propDbType.Success,
+                        typeDto.Alias)
                     {
-                        Alias = typeDto.Alias,
                         DataTypeDefinitionId = typeDto.DataTypeId,
                         Description = typeDto.Description,
                         Id = typeDto.Id.Value,
@@ -158,9 +158,9 @@ namespace Umbraco.Core.Persistence.Factories
                     propDbType.Result,
                     //This flag tells the property type that it has an explicit dbtype and that it cannot be changed
                     // which is what we want for the built-in properties.
-                    propDbType.Success)
+                    propDbType.Success,
+                    typeDto.Alias)
                 {
-                    Alias = typeDto.Alias,
                     DataTypeDefinitionId = typeDto.DataTypeId,
                     Description = typeDto.Description,
                     HelpText = typeDto.HelpText,

src/Umbraco.Core/Persistence/Factories/UserFactory.cs

@@ -32,9 +32,7 @@ namespace Umbraco.Core.Persistence.Factories
                     IsLockedOut = dto.NoConsole,
                     IsApproved = dto.Disabled == false,
                     Email = dto.Email,
-                    Language = dto.UserLanguage,
-                    //NOTE: The default permission come from the user type's default permissions
-                    DefaultPermissions = _userType.Permissions
+                    Language = dto.UserLanguage
                 };
 
             foreach (var app in dto.User2AppDtos)

src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs

@@ -27,13 +27,13 @@ namespace Umbraco.Core.Persistence.Repositories
     internal abstract class ContentTypeBaseRepository<TEntity> : PetaPocoRepositoryBase<int, TEntity>
         where TEntity : class, IContentTypeComposition
     {
-		protected ContentTypeBaseRepository(IDatabaseUnitOfWork work)
-			: base(work)
+        protected ContentTypeBaseRepository(IDatabaseUnitOfWork work)
+            : base(work)
         {
         }
 
-		protected ContentTypeBaseRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache)
-			: base(work, cache)
+        protected ContentTypeBaseRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache)
+            : base(work, cache)
         {
         }
 
@@ -66,7 +66,7 @@ namespace Umbraco.Core.Persistence.Repositories
         
         protected virtual PropertyType CreatePropertyType(string propertyEditorAlias, DataTypeDatabaseType dbType, string propertyTypeAlias)
         {
-            return new PropertyType(propertyEditorAlias, dbType);
+            return new PropertyType(propertyEditorAlias, dbType, propertyTypeAlias);
         }
 
         protected void PersistNewBaseContentType(ContentTypeDto dto, IContentTypeComposition entity)
@@ -414,7 +414,7 @@ AND umbracoNode.id <> @id",
                .Where<ContentTypeAllowedContentTypeDto>(x => x.Id == id);
 
             var allowedContentTypeDtos = Database.Fetch<ContentTypeAllowedContentTypeDto, ContentTypeDto>(sql);
-            return allowedContentTypeDtos.Select(x => new ContentTypeSort { Id = new Lazy<int>(() => x.AllowedId), Alias = x.ContentTypeDto.Alias, SortOrder = x.SortOrder }).ToList();
+            return allowedContentTypeDtos.Select(x => new ContentTypeSort(new Lazy<int>(() => x.AllowedId), x.SortOrder, x.ContentTypeDto.Alias)).ToList();
         }
 
         protected PropertyGroupCollection GetPropertyGroupCollection(int id, DateTime createDate, DateTime updateDate)
@@ -451,8 +451,7 @@ AND umbracoNode.id <> @id",
             var list = new List<PropertyType>();
             foreach (var dto in dtos.Where(x => (x.PropertyTypeGroupId > 0) == false))
             {
-                var propType = CreatePropertyType(dto.DataTypeDto.PropertyEditorAlias, dto.DataTypeDto.DbType.EnumParse<DataTypeDatabaseType>(true), dto.Alias);
-                propType.Alias = dto.Alias;
+                var propType = CreatePropertyType(dto.DataTypeDto.PropertyEditorAlias, dto.DataTypeDto.DbType.EnumParse<DataTypeDatabaseType>(true), dto.Alias);      
                 propType.DataTypeDefinitionId = dto.DataTypeId;
                 propType.Description = dto.Description;
                 propType.Id = dto.Id;
@@ -694,20 +693,20 @@ AND umbracoNode.id <> @id",
                 mediaTypeIds = mediaTypeIds.Distinct().ToArray();
 
                 var sql = @"SELECT cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc,
-		                        cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
+                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
                                 AllowedTypes.allowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,		                        
                                 ParentTypes.parentContentTypeId as chtParentId,
                                 umbracoNode.createDate as nCreateDate, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
-		                        umbracoNode.parentID as nParentId, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("path") + @" as nPath, umbracoNode.sortOrder as nSortOrder, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("text") + @" as nName, umbracoNode.trashed as nTrashed,
-		                        umbracoNode.uniqueID as nUniqueId
+                                umbracoNode.parentID as nParentId, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("path") + @" as nPath, umbracoNode.sortOrder as nSortOrder, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("text") + @" as nName, umbracoNode.trashed as nTrashed,
+                                umbracoNode.uniqueID as nUniqueId
                         FROM cmsContentType
                         INNER JOIN umbracoNode
                         ON cmsContentType.nodeId = umbracoNode.id
                         LEFT JOIN (
-	                        SELECT cmsContentTypeAllowedContentType.Id, cmsContentTypeAllowedContentType.AllowedId, cmsContentType.alias, cmsContentTypeAllowedContentType.SortOrder 
-	                        FROM cmsContentTypeAllowedContentType	
-	                        INNER JOIN cmsContentType
-	                        ON cmsContentTypeAllowedContentType.AllowedId = cmsContentType.nodeId
+                            SELECT cmsContentTypeAllowedContentType.Id, cmsContentTypeAllowedContentType.AllowedId, cmsContentType.alias, cmsContentTypeAllowedContentType.SortOrder 
+                            FROM cmsContentTypeAllowedContentType	
+                            INNER JOIN cmsContentType
+                            ON cmsContentTypeAllowedContentType.AllowedId = cmsContentType.nodeId
                         ) AllowedTypes
                         ON AllowedTypes.Id = cmsContentType.nodeId
                         LEFT JOIN cmsContentType2ContentType as ParentTypes
@@ -801,30 +800,30 @@ AND umbracoNode.id <> @id",
                 contentTypeIds = contentTypeIds.Distinct().ToArray();
 
                 var sql = @"SELECT cmsDocumentType.IsDefault as dtIsDefault, cmsDocumentType.templateNodeId as dtTemplateId,
-		                        cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc,
-		                        cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
+                                cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc,
+                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
                                 AllowedTypes.allowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,		                        
                                 ParentTypes.parentContentTypeId as chtParentId,
                                 umbracoNode.createDate as nCreateDate, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
-		                        umbracoNode.parentID as nParentId, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("path") + @" as nPath, umbracoNode.sortOrder as nSortOrder, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("text") + @" as nName, umbracoNode.trashed as nTrashed,
-		                        umbracoNode.uniqueID as nUniqueId,                                
-		                        Template.alias as tAlias, Template.nodeId as tId,Template.text as tText
+                                umbracoNode.parentID as nParentId, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("path") + @" as nPath, umbracoNode.sortOrder as nSortOrder, umbracoNode." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("text") + @" as nName, umbracoNode.trashed as nTrashed,
+                                umbracoNode.uniqueID as nUniqueId,                                
+                                Template.alias as tAlias, Template.nodeId as tId,Template.text as tText
                         FROM cmsContentType
                         INNER JOIN umbracoNode
                         ON cmsContentType.nodeId = umbracoNode.id
                         LEFT JOIN cmsDocumentType
                         ON cmsDocumentType.contentTypeNodeId = cmsContentType.nodeId
                         LEFT JOIN (
-	                        SELECT cmsContentTypeAllowedContentType.Id, cmsContentTypeAllowedContentType.AllowedId, cmsContentType.alias, cmsContentTypeAllowedContentType.SortOrder 
-	                        FROM cmsContentTypeAllowedContentType	
-	                        INNER JOIN cmsContentType
-	                        ON cmsContentTypeAllowedContentType.AllowedId = cmsContentType.nodeId
+                            SELECT cmsContentTypeAllowedContentType.Id, cmsContentTypeAllowedContentType.AllowedId, cmsContentType.alias, cmsContentTypeAllowedContentType.SortOrder 
+                            FROM cmsContentTypeAllowedContentType	
+                            INNER JOIN cmsContentType
+                            ON cmsContentTypeAllowedContentType.AllowedId = cmsContentType.nodeId
                         ) AllowedTypes
                         ON AllowedTypes.Id = cmsContentType.nodeId
                         LEFT JOIN (
-	                        SELECT * FROM cmsTemplate
-	                        INNER JOIN umbracoNode
-	                        ON cmsTemplate.nodeId = umbracoNode.id
+                            SELECT * FROM cmsTemplate
+                            INNER JOIN umbracoNode
+                            ON cmsTemplate.nodeId = umbracoNode.id
                         ) as Template
                         ON Template.nodeId = cmsDocumentType.templateNodeId
                         LEFT JOIN cmsContentType2ContentType as ParentTypes
@@ -872,8 +871,8 @@ AND umbracoNode.id <> @id",
                     //get the unique list of associated templates
                     var defaultTemplates = result
                         .Where(x => x.ctId == currentCtId)
-                        //use a tuple so that distinct checks both values
-                        .Select(x => new Tuple<bool?, int?>(x.dtIsDefault, x.dtTemplateId))
+                        //use a tuple so that distinct checks both values (in some rare cases the dtIsDefault will not compute as bool?, so we force it with Convert.ToBoolean)
+                        .Select(x => new Tuple<bool?, int?>(Convert.ToBoolean(x.dtIsDefault), x.dtTemplateId))
                         .Where(x => x.Item1.HasValue && x.Item2.HasValue)
                         .Distinct()
                         .OrderByDescending(x => x.Item1.Value)
@@ -1041,10 +1040,9 @@ AND umbracoNode.id <> @id",
                         .Select(group => new PropertyGroup(new PropertyTypeCollection(
                             result
                                 .Where(row => row.pgId == group.GroupId && row.ptId != null)
-                                .Select(row => new PropertyType(row.dtPropEdAlias, Enum<DataTypeDatabaseType>.Parse(row.dtDbType))
+                                .Select(row => new PropertyType(row.dtPropEdAlias, Enum<DataTypeDatabaseType>.Parse(row.dtDbType), row.ptAlias)
                                 {
                                     //fill in the rest of the property type properties
-                                    Alias = row.ptAlias,
                                     Description = row.ptDesc,
                                     DataTypeDefinitionId = row.dtId,
                                     Id = row.ptId,
@@ -1070,10 +1068,9 @@ AND umbracoNode.id <> @id",
                         .Where(x => x.pgId == null)
                         //filter based on the current content type
                         .Where(x => x.contentTypeId == currId)
-                        .Select(row => new PropertyType(row.dtPropEdAlias, Enum<DataTypeDatabaseType>.Parse(row.dtDbType))
+                        .Select(row => new PropertyType(row.dtPropEdAlias, Enum<DataTypeDatabaseType>.Parse(row.dtDbType), row.ptAlias)
                         {
                             //fill in the rest of the property type properties
-                            Alias = row.ptAlias,
                             Description = row.ptDesc,
                             DataTypeDefinitionId = row.dtId,
                             Id = row.ptId,

src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs

@@ -258,7 +258,8 @@ namespace Umbraco.Core.Persistence.Repositories
             return new PropertyType(propertyEditorAlias, propDbType.Result,
                 //This flag tells the property type that it has an explicit dbtype and that it cannot be changed
                 // which is what we want for the built-in properties.
-                propDbType.Success);
+                propDbType.Success,
+                propertyTypeAlias);
         }
 
         /// <summary>

src/Umbraco.Core/PropertyEditors/GridEditor.cs

@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    internal class GridEditor
+    {
+        public GridEditor()
+        {
+            Config = new Dictionary<string, object>();
+        }
+
+        [JsonProperty("name", Required = Required.Always)]
+        public string Name { get; set; }
+
+        [JsonProperty("alias", Required = Required.Always)]
+        public string Alias { get; set; }
+
+        [JsonProperty("view", Required = Required.Always)]
+        public string View { get; set; }
+
+        [JsonProperty("render")]
+        public string Render { get; set; }
+
+        [JsonProperty("icon", Required = Required.Always)]
+        public string Icon { get; set; }
+
+        [JsonProperty("config")]
+        public IDictionary<string, object> Config { get; set; }
+
+        protected bool Equals(GridEditor other)
+        {
+            return string.Equals(Alias, other.Alias);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// true if the specified object  is equal to the current object; otherwise, false.
+        /// </returns>
+        /// <param name="obj">The object to compare with the current object. </param>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((GridEditor) obj);
+        }
+
+        /// <summary>
+        /// Serves as a hash function for a particular type. 
+        /// </summary>
+        /// <returns>
+        /// A hash code for the current <see cref="T:System.Object"/>.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            return Alias.GetHashCode();
+        }
+    }
+}

src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs

@@ -15,11 +15,14 @@ namespace Umbraco.Core.PropertyEditors
     /// </remarks>
     internal class ParameterEditorResolver : LazyManyObjectsResolverBase<ParameterEditorResolver, IParameterEditor>
     {
-        public ParameterEditorResolver(Func<IEnumerable<Type>> typeListProducerList)
+        private readonly ManifestBuilder _builder;
+
+        public ParameterEditorResolver(Func<IEnumerable<Type>> typeListProducerList, ManifestBuilder builder)
             : base(typeListProducerList, ObjectLifetimeScope.Application)
         {
+            _builder = builder;
         }
-        
+
         /// <summary>
         /// Returns the parameter editors
         /// </summary>
@@ -38,9 +41,9 @@ namespace Umbraco.Core.PropertyEditors
                     //exclude the non parameter editor c# property editors
                     .Except(filtered)
                     //include the manifest parameter editors
-                    .Union(ManifestBuilder.ParameterEditors)
+                    .Union(_builder.ParameterEditors)
                     //include the manifest prop editors that are parameter editors
-                    .Union(ManifestBuilder.PropertyEditors.Where(x => x.IsParameterEditor));
+                    .Union(_builder.PropertyEditors.Where(x => x.IsParameterEditor));
             }
         }
 

src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using Umbraco.Core.IO;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.ObjectResolution;
 
@@ -17,14 +19,27 @@ namespace Umbraco.Core.PropertyEditors
         public PropertyEditorResolver(Func<IEnumerable<Type>> typeListProducerList)
             : base(typeListProducerList, ObjectLifetimeScope.Application)
         {
+            var builder = new ManifestBuilder(
+                ApplicationContext.Current.ApplicationCache.RuntimeCache,
+                new ManifestParser(new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")), ApplicationContext.Current.ApplicationCache.RuntimeCache));
+
+            _unioned = new Lazy<List<PropertyEditor>>(() => Values.Union(builder.PropertyEditors).ToList());
         }
 
+        internal PropertyEditorResolver(Func<IEnumerable<Type>> typeListProducerList, ManifestBuilder builder)
+            : base(typeListProducerList, ObjectLifetimeScope.Application)
+        {
+            _unioned = new Lazy<List<PropertyEditor>>(() => Values.Union(builder.PropertyEditors).ToList());
+        }
+
+        private readonly Lazy<List<PropertyEditor>> _unioned;
+
         /// <summary>
         /// Returns the property editors
         /// </summary>
         public IEnumerable<PropertyEditor> PropertyEditors
         {
-            get { return Values.Union(ManifestBuilder.PropertyEditors); }
+            get { return _unioned.Value; }
         }
 
         /// <summary>

src/Umbraco.Core/Security/MembershipProviderBase.cs

@@ -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();
+        }
+
     }
 }

src/Umbraco.Core/Services/ApplicationTreeService.cs

@@ -128,7 +128,7 @@ namespace Umbraco.Core.Services
                     return list;
 
 
-                });
+                }, new TimeSpan(0, 10, 0));
         }
 
         /// <summary>

src/Umbraco.Core/Services/ContentService.cs

@@ -500,7 +500,7 @@ namespace Umbraco.Core.Services
         public IEnumerable<IContent> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalChildren,
             string orderBy, Direction orderDirection, string filter = "")
         {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageSize");
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
             Mandate.ParameterCondition(pageSize > 0, "pageSize");
             using (var repository = _repositoryFactory.CreateContentRepository(_uowProvider.GetUnitOfWork()))
             {
@@ -530,7 +530,7 @@ namespace Umbraco.Core.Services
         /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
         public IEnumerable<IContent> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalChildren, string orderBy = "Path", Direction orderDirection = Direction.Ascending, string filter = "")
         {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageSize");
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
             Mandate.ParameterCondition(pageSize > 0, "pageSize");
             using (var repository = _repositoryFactory.CreateContentRepository(_uowProvider.GetUnitOfWork()))
             {

src/Umbraco.Core/Services/EntityService.cs

@@ -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)

src/Umbraco.Core/Services/IEntityService.cs

@@ -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.

src/Umbraco.Core/Services/ILocalizedTextService.cs

@@ -33,5 +33,19 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <returns></returns>
         IEnumerable<CultureInfo> GetSupportedCultures();
+
+        /// <summary>
+        /// Tries to resolve a full 4 letter culture from a 2 letter culture name
+        /// </summary>
+        /// <param name="currentCulture">
+        /// The culture to determine if it is only a 2 letter culture, if so we'll try to convert it, otherwise it will just be returned
+        /// </param>
+        /// <returns></returns>
+        /// <remarks>
+        /// TODO: This is just a hack due to the way we store the language files, they should be stored with 4 letters since that 
+        /// is what they reference but they are stored with 2, further more our user's languages are stored with 2. So this attempts
+        /// to resolve the full culture if possible.
+        /// </remarks>
+        CultureInfo ConvertToSupportedCultureWithRegionCode(CultureInfo currentCulture);
     }
 }

src/Umbraco.Core/Services/LocalizedTextService.cs

@@ -13,6 +13,7 @@ namespace Umbraco.Core.Services
 
     public class LocalizedTextService : ILocalizedTextService
     {
+        private readonly LocalizedTextServiceFileSources _fileSources;
         private readonly IDictionary<CultureInfo, IDictionary<string, IDictionary<string, string>>> _dictionarySource;
         private readonly IDictionary<CultureInfo, Lazy<XDocument>> _xmlSource;
 
@@ -22,7 +23,8 @@ namespace Umbraco.Core.Services
         /// <param name="fileSources"></param>
         public LocalizedTextService(LocalizedTextServiceFileSources fileSources)
         {
-            _xmlSource = fileSources.GetXmlSources();
+            if (fileSources == null) throw new ArgumentNullException("fileSources");
+            _fileSources = fileSources;
         }
 
         /// <summary>
@@ -49,6 +51,9 @@ namespace Umbraco.Core.Services
         {
             Mandate.ParameterNotNull(culture, "culture");
 
+            //TODO: Hack, see notes on ConvertToSupportedCultureWithRegionCode
+            culture = ConvertToSupportedCultureWithRegionCode(culture);
+
             //This is what the legacy ui service did
             if (string.IsNullOrEmpty(key))
                 return string.Empty;
@@ -57,10 +62,14 @@ namespace Umbraco.Core.Services
             var area = keyParts.Length > 1 ? keyParts[0] : null;
             var alias = keyParts.Length > 1 ? keyParts[1] : keyParts[0];
 
-            if (_xmlSource != null)
+            var xmlSource = _xmlSource ?? (_fileSources != null
+                ? _fileSources.GetXmlSources()
+                : null);
+
+            if (xmlSource != null)
             {
-                return GetFromXmlSource(culture, area, alias, tokens);
-            }
+                return GetFromXmlSource(xmlSource, culture, area, alias, tokens);
+            }          
             else
             {
                 return GetFromDictionarySource(culture, area, alias, tokens);
@@ -75,18 +84,25 @@ namespace Umbraco.Core.Services
         {
             if (culture == null) throw new ArgumentNullException("culture");
 
+            //TODO: Hack, see notes on ConvertToSupportedCultureWithRegionCode
+            culture = ConvertToSupportedCultureWithRegionCode(culture);
+
             var result = new Dictionary<string, string>();
 
-            if (_xmlSource != null)
+            var xmlSource = _xmlSource ?? (_fileSources != null
+                ? _fileSources.GetXmlSources()
+                : null);
+
+            if (xmlSource != null)
             {
-                if (_xmlSource.ContainsKey(culture) == false)
+                if (xmlSource.ContainsKey(culture) == false)
                 {
                     LogHelper.Warn<LocalizedTextService>("The culture specified {0} was not found in any configured sources for this service", () => culture);
                     return result;
                 }
 
                 //convert all areas + keys to a single key with a '/'
-                var areas = _xmlSource[culture].Value.XPathSelectElements("//area");
+                var areas = xmlSource[culture].Value.XPathSelectElements("//area");
                 foreach (var area in areas)
                 {
                     var keys = area.XPathSelectElements("./key");
@@ -133,7 +149,36 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public IEnumerable<CultureInfo> GetSupportedCultures()
         {
-            return _xmlSource != null ? _xmlSource.Keys : _dictionarySource.Keys;
+            var xmlSource = _xmlSource ?? (_fileSources != null
+                ? _fileSources.GetXmlSources()
+                : null);
+
+            return xmlSource != null ? xmlSource.Keys : _dictionarySource.Keys;
+        }
+
+        /// <summary>
+        /// Tries to resolve a full 4 letter culture from a 2 letter culture name
+        /// </summary>
+        /// <param name="currentCulture">
+        /// The culture to determine if it is only a 2 letter culture, if so we'll try to convert it, otherwise it will just be returned
+        /// </param>
+        /// <returns></returns>
+        /// <remarks>
+        /// TODO: This is just a hack due to the way we store the language files, they should be stored with 4 letters since that 
+        /// is what they reference but they are stored with 2, further more our user's languages are stored with 2. So this attempts
+        /// to resolve the full culture if possible.
+        /// 
+        /// This only works when this service is constructed with the LocalizedTextServiceFileSources
+        /// </remarks>
+        public CultureInfo ConvertToSupportedCultureWithRegionCode(CultureInfo currentCulture)
+        {
+            if (currentCulture == null) throw new ArgumentNullException("currentCulture");
+            
+            if (_fileSources == null) return currentCulture;
+            if (currentCulture.Name.Length > 2) return currentCulture;
+
+            var attempt = _fileSources.TryConvert2LetterCultureTo4Letter(currentCulture.TwoLetterISOLanguageName);
+            return attempt ? attempt.Result : currentCulture;
         }
 
         private string GetFromDictionarySource(CultureInfo culture, string area, string key, IDictionary<string, string> tokens)
@@ -174,15 +219,15 @@ namespace Umbraco.Core.Services
             return "[" + key + "]";
         }
 
-        private string GetFromXmlSource(CultureInfo culture, string area, string key, IDictionary<string, string> tokens)
+        private static string GetFromXmlSource(IDictionary<CultureInfo, Lazy<XDocument>> xmlSource, CultureInfo culture, string area, string key, IDictionary<string, string> tokens)
         {
-            if (_xmlSource.ContainsKey(culture) == false)
+            if (xmlSource.ContainsKey(culture) == false)
             {
                 LogHelper.Warn<LocalizedTextService>("The culture specified {0} was not found in any configured sources for this service", () => culture);
                 return "[" + key + "]";                
             }
 
-            var cultureSource = _xmlSource[culture].Value;
+            var cultureSource = xmlSource[culture].Value;
             
             var xpath = area.IsNullOrWhiteSpace()
                     ? string.Format("//key [@alias = '{0}']", key)
@@ -213,7 +258,7 @@ namespace Umbraco.Core.Services
         /// we support a dictionary which means in the future we can really have any sort of token system. 
         /// Currently though, the token key's will need to be an integer and sequential - though we aren't going to throw exceptions if that is not the case.
         /// </remarks>
-        internal string ParseTokens(string value, IDictionary<string, string> tokens)
+        internal static string ParseTokens(string value, IDictionary<string, string> tokens)
         {
             if (tokens == null || tokens.Any() == false)
             {

src/Umbraco.Core/Services/LocalizedTextServiceFileSources.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
@@ -16,12 +17,86 @@ namespace Umbraco.Core.Services
         private readonly IRuntimeCacheProvider _cache;
         private readonly DirectoryInfo _fileSourceFolder;
 
+        //TODO: See other notes in this class, this is purely a hack because we store 2 letter culture file names that contain 4 letter cultures :(
+        private readonly Dictionary<string, CultureInfo> _twoLetterCultureConverter = new Dictionary<string, CultureInfo>();
+
+        private readonly Lazy<Dictionary<CultureInfo, Lazy<XDocument>>> _xmlSources;
+
         public LocalizedTextServiceFileSources(IRuntimeCacheProvider cache, DirectoryInfo fileSourceFolder)
         {
             if (cache == null) throw new ArgumentNullException("cache");
             if (fileSourceFolder == null) throw new ArgumentNullException("fileSourceFolder");
+
             _cache = cache;
 
+            //Create the lazy source for the _xmlSources
+            _xmlSources = new Lazy<Dictionary<CultureInfo, Lazy<XDocument>>>(() =>
+            {
+                var result = new Dictionary<CultureInfo, Lazy<XDocument>>();
+
+                if (_fileSourceFolder == null) return result;
+
+                foreach (var fileInfo in _fileSourceFolder.GetFiles("*.xml"))
+                {
+                    var localCopy = fileInfo;
+                    var filename = Path.GetFileNameWithoutExtension(localCopy.FullName).Replace("_", "-");
+
+                    //TODO: Fix this nonsense... would have to wait until v8 to store the language files with their correct
+                    // names instead of storing them as 2 letters but actually having a 4 letter culture. wtf. So now, we
+                    // need to check if the file is 2 letters, then open it to try to find it's 4 letter culture, then use that
+                    // if it's successful. We're going to assume (though it seems assuming in the legacy logic is never a great idea)
+                    // that any 4 letter file is named with the actual culture that it is!
+                    CultureInfo culture = null;
+                    if (filename.Length == 2)
+                    {
+                        //we need to open the file to see if we can read it's 'real' culture, we'll use XmlReader since we don't
+                        //want to load in the entire doc into mem just to read a single value
+                        using (var fs = fileInfo.OpenRead())
+                        using (var reader = XmlReader.Create(fs))
+                        {
+                            if (reader.IsStartElement())
+                            {
+                                if (reader.Name == "language")
+                                {
+                                    if (reader.MoveToAttribute("culture"))
+                                    {
+                                        var cultureVal = reader.Value;
+                                        try
+                                        {
+                                            culture = CultureInfo.GetCultureInfo(cultureVal);
+                                            //add to the tracked dictionary
+                                            _twoLetterCultureConverter[filename] = culture;
+                                        }
+                                        catch (CultureNotFoundException)
+                                        {
+                                            LogHelper.Warn<LocalizedTextServiceFileSources>(
+                                                string.Format("The culture {0} found in the file {1} is not a valid culture", cultureVal, fileInfo.FullName));
+                                            //If the culture in the file is invalid, we'll just hope the file name is a valid culture below, otherwise
+                                            // an exception will be thrown.
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (culture == null)
+                    {
+                        culture = CultureInfo.GetCultureInfo(filename);
+                    }
+
+                    //get the lazy value from cache                
+                    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}));
+                }
+                return result;
+            });
+
             if (fileSourceFolder.Exists == false)
             {
                 LogHelper.Warn<LocalizedTextServiceFileSources>("The folder does not exist: {0}, therefore no sources will be discovered", () => fileSourceFolder.FullName);
@@ -38,26 +113,20 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public IDictionary<CultureInfo, Lazy<XDocument>> GetXmlSources()
         {
-            var result = new Dictionary<CultureInfo, Lazy<XDocument>>();
+            return _xmlSources.Value;
+        }
 
-            if (_fileSourceFolder == null) return result;
+        //TODO: See other notes in this class, this is purely a hack because we store 2 letter culture file names that contain 4 letter cultures :(
+        public Attempt<CultureInfo> TryConvert2LetterCultureTo4Letter(string twoLetterCulture)
+        {
+            if (twoLetterCulture.Length != 2) Attempt<CultureInfo>.Fail();
 
-            foreach (var fileInfo in _fileSourceFolder.GetFiles("*.xml"))
-            {
-                var localCopy = fileInfo;
-                var filename = Path.GetFileNameWithoutExtension(localCopy.FullName).Replace("_", "-");
-                var culture = CultureInfo.GetCultureInfo(filename);
-                //get the lazy value from cache                
-                result.Add(culture, new Lazy<XDocument>(() => _cache.GetCacheItem<XDocument>(
-                    string.Format("{0}-{1}", typeof (LocalizedTextServiceFileSources).Name, culture.TwoLetterISOLanguageName), () =>
-                    {
-                        using (var fs = localCopy.OpenRead())
-                        {
-                            return XDocument.Load(fs);
-                        }
-                    }, isSliding: true, timeout: TimeSpan.FromMinutes(10), dependentFiles: new[] {localCopy.FullName})));
-            }
-            return result;
+            //This needs to be resolved before continuing so that the _twoLetterCultureConverter cache is initialized
+            var resolved = _xmlSources.Value;
+
+            return _twoLetterCultureConverter.ContainsKey(twoLetterCulture)
+                ? Attempt.Succeed(_twoLetterCultureConverter[twoLetterCulture])
+                : Attempt<CultureInfo>.Fail();
         }
     }
 }

src/Umbraco.Core/Services/MediaService.cs

@@ -408,7 +408,7 @@ namespace Umbraco.Core.Services
         public IEnumerable<IMedia> GetPagedChildren(int id, int pageIndex, int pageSize, out int totalChildren,
             string orderBy, Direction orderDirection, string filter = "")
         {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageSize");
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
             Mandate.ParameterCondition(pageSize > 0, "pageSize");
             using (var repository = _repositoryFactory.CreateMediaRepository(_uowProvider.GetUnitOfWork()))
             {
@@ -437,7 +437,7 @@ namespace Umbraco.Core.Services
         /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
         public IEnumerable<IMedia> GetPagedDescendants(int id, int pageIndex, int pageSize, out int totalChildren, string orderBy = "Path", Direction orderDirection = Direction.Ascending, string filter = "")
         {
-            Mandate.ParameterCondition(pageIndex >= 0, "pageSize");
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
             Mandate.ParameterCondition(pageSize > 0, "pageSize");
             using (var repository = _repositoryFactory.CreateMediaRepository(_uowProvider.GetUnitOfWork()))
             {

src/Umbraco.Core/Services/MemberService.cs

@@ -1221,44 +1221,38 @@ namespace Umbraco.Core.Services
                     Name = "Membership",
                     Id = --identity
                 };
-            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.TextboxAlias, DataTypeDatabaseType.Ntext)
+            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.TextboxAlias, DataTypeDatabaseType.Ntext, Constants.Conventions.Member.Comments)
                 {
-                    Alias = Constants.Conventions.Member.Comments,
                     Name = Constants.Conventions.Member.CommentsLabel,
                     SortOrder = 0,
                     Id = --identity
                 });
-            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer)
+            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, Constants.Conventions.Member.IsApproved)
                 {
-                    Alias = Constants.Conventions.Member.IsApproved,
                     Name = Constants.Conventions.Member.IsApprovedLabel,
                     SortOrder = 3,
                     Id = --identity
                 });
-            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer)
+            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, Constants.Conventions.Member.IsLockedOut)
                 {
-                    Alias = Constants.Conventions.Member.IsLockedOut,
                     Name = Constants.Conventions.Member.IsLockedOutLabel,
                     SortOrder = 4,
                     Id = --identity
                 });
-            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date)
+            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, Constants.Conventions.Member.LastLockoutDate)
                 {
-                    Alias = Constants.Conventions.Member.LastLockoutDate,
                     Name = Constants.Conventions.Member.LastLockoutDateLabel,
                     SortOrder = 5,
                     Id = --identity
                 });
-            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date)
+            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, Constants.Conventions.Member.LastLoginDate)
                 {
-                    Alias = Constants.Conventions.Member.LastLoginDate,
                     Name = Constants.Conventions.Member.LastLoginDateLabel,
                     SortOrder = 6,
                     Id = --identity
                 });
-            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date)
+            propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, Constants.Conventions.Member.LastPasswordChangeDate)
                 {
-                    Alias = Constants.Conventions.Member.LastPasswordChangeDate,
                     Name = Constants.Conventions.Member.LastPasswordChangeDateLabel,
                     SortOrder = 7,
                     Id = --identity

src/Umbraco.Core/Services/PackagingService.cs

@@ -648,9 +648,8 @@ namespace Umbraco.Core.Services
                     if (dataTypeDefinition == null) continue;
                 }
 
-                var propertyType = new PropertyType(dataTypeDefinition)
+                var propertyType = new PropertyType(dataTypeDefinition, property.Element("Alias").Value)
                                        {
-                                           Alias = property.Element("Alias").Value,
                                            Name = property.Element("Name").Value,
                                            Description = property.Element("Description").Value,
                                            Mandatory = property.Element("Mandatory").Value.ToLowerInvariant().Equals("true"),

src/Umbraco.Core/Services/SectionService.cs

@@ -147,7 +147,7 @@ namespace Umbraco.Core.Services
 
                         return list;
 
-                    });
+                    }, new TimeSpan(0, 10, 0));
         }
 
         internal void LoadXml(Func<XDocument, bool> callback, bool saveAfterCallbackIfChanged)

src/Umbraco.Core/Services/ServiceContext.cs

@@ -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));

src/Umbraco.Core/Services/UserService.cs

@@ -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)

src/Umbraco.Core/Strategies/RelateOnCopyHandler.cs

@@ -5,6 +5,7 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Strategies
 {
+    //TODO: This should just exist in the content service/repo! 
     public sealed class RelateOnCopyHandler : ApplicationEventHandler
     {
         protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)

src/Umbraco.Core/Umbraco.Core.csproj

@@ -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.6\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>
@@ -136,6 +136,7 @@
     <Compile Include="ApplicationContext.cs" />
     <Compile Include="ApplicationEventHandler.cs" />
     <Compile Include="AssemblyExtensions.cs" />
+    <Compile Include="AsyncLock.cs" />
     <Compile Include="Attempt{T}.cs" />
     <Compile Include="Auditing\AuditTrail.cs" />
     <Compile Include="Auditing\Audit.cs" />
@@ -312,8 +313,10 @@
     <Compile Include="Events\SendToPublishEventArgs.cs" />
     <Compile Include="Exceptions\InvalidCompositionException.cs" />
     <Compile Include="HideFromTypeFinderAttribute.cs" />
+    <Compile Include="HttpContextExtensions.cs" />
     <Compile Include="IApplicationEventHandler.cs" />
     <Compile Include="IDisposeOnRequestEnd.cs" />
+    <Compile Include="Manifest\GridEditorConverter.cs" />
     <Compile Include="Media\Exif\BitConverterEx.cs" />
     <Compile Include="Media\Exif\ExifBitConverter.cs" />
     <Compile Include="Media\Exif\ExifEnums.cs" />
@@ -347,6 +350,7 @@
     <Compile Include="IO\ResizedImage.cs" />
     <Compile Include="IO\UmbracoMediaFile.cs" />
     <Compile Include="Models\IPartialView.cs" />
+    <Compile Include="PropertyEditors\GridEditor.cs" />
     <Compile Include="Services\LocalizedTextService.cs" />
     <Compile Include="Services\ILocalizedTextService.cs" />
     <Compile Include="Macros\XsltExtension.cs" />
@@ -1124,6 +1128,7 @@
     <Compile Include="Standalone\ServiceContextManager.cs" />
     <Compile Include="Standalone\StandaloneCoreApplication.cs" />
     <Compile Include="Standalone\StandaloneCoreBootManager.cs" />
+    <Compile Include="Strategies\RelateOnCopyHandler.cs" />
     <Compile Include="Strings\ContentBaseExtensions.cs" />
     <Compile Include="Strings\Diff.cs" />
     <Compile Include="Sync\CurrentServerEnvironmentStatus.cs" />
@@ -1212,6 +1217,7 @@
     <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" />

src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs

@@ -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;
+        }
+
+    }
+}

src/Umbraco.Core/XmlExtensions.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.XPath;
@@ -13,6 +16,31 @@ namespace Umbraco.Core
 	/// </summary>
 	internal static class XmlExtensions
 	{
+        /// <summary>
+        /// Saves the xml document async
+        /// </summary>
+        /// <param name="xdoc"></param>
+        /// <param name="filename"></param>
+        /// <returns></returns>
+	    public static async Task SaveAsync(this XmlDocument xdoc, string filename)
+	    {
+            if (xdoc.DocumentElement == null)
+                throw new XmlException("Cannot save xml document, there is no root element");
+
+            using (var fs = new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.Read, bufferSize: 4096, useAsync: true))
+            using (var xmlWriter = XmlWriter.Create(fs, new XmlWriterSettings
+            {
+                Async = true,
+                Encoding = Encoding.UTF8,
+                Indent = true
+            }))
+            {
+                //NOTE: There are no nice methods to write it async, only flushing it async. We
+                // could implement this ourselves but it'd be a very manual process.
+                xdoc.WriteTo(xmlWriter);
+                await xmlWriter.FlushAsync().ConfigureAwait(false);
+            }
+	    }
 
         public static bool HasAttribute(this XmlAttributeCollection attributes, string attributeName)
         {

src/Umbraco.Core/packages.config

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="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.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="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.6.5" targetFramework="net40" />
-  <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="AutoMapper" version="3.0.0" targetFramework="net45" userInstalled="true" />
+  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" userInstalled="true" />
+  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net4" userInstalled="true" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net4" userInstalled="true" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net4" userInstalled="true" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" userInstalled="true" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net4" userInstalled="true" />
+  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" userInstalled="true" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" userInstalled="true" />
+  <package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net45" userInstalled="true" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net4" userInstalled="true" />
+  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" userInstalled="true" />
+  <package id="MySql.Data" version="6.9.6" targetFramework="net45" userInstalled="true" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" userInstalled="true" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net4" userInstalled="true" />
+  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net4" userInstalled="true" />
 </packages>

src/Umbraco.Tests/Cache/CacheProviderTests.cs

@@ -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]

src/Umbraco.Tests/Cache/HttpRuntimeCacheProviderTests.cs

@@ -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;
+        }
     }
 }

src/Umbraco.Tests/CodeFirst/Definitions/ContentTypeDefinitionFactory.cs

@@ -108,12 +108,11 @@ namespace Umbraco.Tests.CodeFirst.Definitions
                 //Check if a PropertyType with the same alias already exists, as we don't want to override existing ones
                 if(group.PropertyTypes.Contains(definition.Alias)) continue;
 
-                var propertyType = new PropertyType(definition.DataTypeDefinition)
+                var propertyType = new PropertyType(definition.DataTypeDefinition, definition.Alias)
                                        {
                                            Mandatory = definition.Mandatory,
                                            ValidationRegExp = definition.ValidationRegExp,
                                            SortOrder = definition.Order,
-                                           Alias = definition.Alias,
                                            Name = definition.Name
                                        };
 
@@ -347,12 +346,10 @@ namespace Umbraco.Tests.CodeFirst.Definitions
             {
                 if(type == currentType) continue;//If the referenced type is equal to the current type we skip it to avoid a circular dependency
 
-                var contentTypeSort = new ContentTypeSort();
+                
                 var isResolved = _contentTypeCache.ContainsKey(type.FullName);
                 var lazy = isResolved ? _contentTypeCache[type.FullName].ContentType : GetContentTypeDefinition(type);
-                contentTypeSort.Id = new Lazy<int>(() => lazy.Value.Id);
-                contentTypeSort.Alias = lazy.Value.Alias;
-                contentTypeSort.SortOrder = order;
+                var contentTypeSort = new ContentTypeSort(new Lazy<int>(() => lazy.Value.Id), order, lazy.Value.Alias);
                 contentTypeSorts.Add(contentTypeSort);
                 order++;
             }

src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs

@@ -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]

src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs

@@ -17,5 +17,16 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "AutoLegacy");
         }
 
+        [Test]
+        public void DisableAlternativeTemplates()
+        {
+            Assert.IsTrue(SettingsSection.WebRouting.DisableAlternativeTemplates == false);
+        }
+
+        [Test]
+        public void DisableFindContentByIdPath()
+        {
+            Assert.IsTrue(SettingsSection.WebRouting.DisableFindContentByIdPath == false);
+        }
     }
 }

src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config

@@ -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>

src/Umbraco.Tests/EnumerableExtensionsTests.cs

@@ -11,6 +11,35 @@ namespace Umbraco.Tests
     public class EnumerableExtensionsTests
     {
 
+        [Test]
+        public void Unsorted_Sequence_Equal()
+        {
+            var list1 = new[] { 1, 2, 3, 4, 5, 6 };
+            var list2 = new[] { 6, 5, 3, 2, 1, 4 };
+            var list3 = new[] { 6, 5, 4, 3, 2, 2 };
+
+            Assert.IsTrue(list1.UnsortedSequenceEqual(list2));
+            Assert.IsTrue(list2.UnsortedSequenceEqual(list1));
+            Assert.IsFalse(list1.UnsortedSequenceEqual(list3));
+
+            Assert.IsTrue(((IEnumerable<object>)null).UnsortedSequenceEqual(null));
+            Assert.IsFalse(((IEnumerable<int>)null).UnsortedSequenceEqual(list1));
+            Assert.IsFalse(list1.UnsortedSequenceEqual(null));
+        }
+
+        [Test]
+        public void Contains_All()
+        {
+            var list1 = new[] {1, 2, 3, 4, 5, 6};
+            var list2 = new[] {6, 5, 3, 2, 1, 4};
+            var list3 = new[] {6, 5, 4, 3};
+
+            Assert.IsTrue(list1.ContainsAll(list2));
+            Assert.IsTrue(list2.ContainsAll(list1));
+            Assert.IsTrue(list1.ContainsAll(list3));
+            Assert.IsFalse(list3.ContainsAll(list1));
+        }
+
         [Test]
         public void Flatten_List_2()
         {

src/Umbraco.Tests/Integration/GetCultureTests.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using umbraco.cms.businesslogic.language;
+using umbraco.cms.businesslogic.web;
+using Umbraco.Tests.Services;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Web.Routing;
+
+namespace Umbraco.Tests.Integration
+{
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
+    [TestFixture, RequiresSTA]
+    public class GetCultureTests : BaseServiceTest
+    {
+        protected override void FreezeResolution()
+        {
+            SiteDomainHelperResolver.Current = new SiteDomainHelperResolver(new SiteDomainHelper());
+
+            base.FreezeResolution();
+        }
+
+        [Test]
+        public void GetCulture()
+        {
+            var contentTypeService = ServiceContext.ContentTypeService;
+            var contentType = MockedContentTypes.CreateSimpleContentType("umbBlah", "test Doc Type");
+            contentTypeService.Save(contentType);
+            var contentService = ServiceContext.ContentService;
+
+            var c1 = contentService.CreateContentWithIdentity("content", -1, "umbBlah");
+            var c2 = contentService.CreateContentWithIdentity("content", c1, "umbBlah");
+            var c3 = contentService.CreateContentWithIdentity("content", c1, "umbBlah");
+            var c4 = contentService.CreateContentWithIdentity("content", c3, "umbBlah");
+
+            var langs = Language.GetAllAsList();
+            foreach (var l in langs.Skip(1))
+                l.Delete();
+
+            Language.MakeNew("fr-FR");
+            Language.MakeNew("de-DE");
+
+            var langEn = Language.GetByCultureCode("en-US");
+            var langFr = Language.GetByCultureCode("fr-FR");
+            var langDe = Language.GetByCultureCode("de-DE");
+
+            var domains = Domain.GetDomains(true); // we want wildcards too here
+            foreach (var d in domains)
+                d.Delete();
+
+            Domain.MakeNew("domain1.com/", c1.Id, langEn.id);
+            Domain.MakeNew("domain1.fr/", c1.Id, langFr.id);
+            Domain.MakeNew("*100112", c3.Id, langDe.id);
+
+            var content = c2;
+            var culture = Web.Models.ContentExtensions.GetCulture(null, ServiceContext.LocalizationService, ServiceContext.ContentService, content.Id, content.Path, 
+                new Uri("http://domain1.com/"));
+            Assert.AreEqual("en-US", culture.Name);
+
+            content = c2;
+            culture = Web.Models.ContentExtensions.GetCulture(null, ServiceContext.LocalizationService, ServiceContext.ContentService, content.Id, content.Path,
+                new Uri("http://domain1.fr/"));
+            Assert.AreEqual("fr-FR", culture.Name);
+
+            content = c4;
+            culture = Web.Models.ContentExtensions.GetCulture(null, ServiceContext.LocalizationService, ServiceContext.ContentService, content.Id, content.Path,
+                new Uri("http://domain1.fr/"));
+            Assert.AreEqual("de-DE", culture.Name);
+        }
+    }
+}

src/Umbraco.Tests/Macros/MacroParserTests.cs

@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Macros
         {
             var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
-<?UMBRACO_MACRO macroAlias=""My.Map.isCool"" />
+<?UMBRACO_MACRO macroAlias=""My.Map.isCool eh[boy!]"" />
 <p>asdfasdf</p>";
             var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
 
@@ -34,8 +34,8 @@ namespace Umbraco.Tests.Macros
             Assert.AreEqual(@"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
-<!-- <?UMBRACO_MACRO macroAlias=""My.Map.isCool"" /> -->
-<ins>Macro alias: <strong>My.Map.isCool</strong></ins></div>
+<!-- <?UMBRACO_MACRO macroAlias=""My.Map.isCool eh[boy!]"" /> -->
+<ins>Macro alias: <strong>My.Map.isCool eh[boy!]</strong></ins></div>
 <p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
         }
 
@@ -109,6 +109,29 @@ 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_Closing_Tag()
         {

src/Umbraco.Tests/Manifest/ManifestParserTests.cs

@@ -63,6 +63,61 @@ namespace Umbraco.Tests.Manifest
             Assert.AreEqual(0, parser.ElementAt(0).PreValueEditor.Fields.ElementAt(1).Validators.Count());
         }
 
+        [Test]
+        public void Parse_Grid_Editors()
+        {
+            var a = JsonConvert.DeserializeObject<JArray>(@"[
+    {
+        alias: 'Test.Test1',
+        name: 'Test 1',        
+        view: 'blah',    
+        icon: 'hello'
+    },
+    {
+        alias: 'Test.Test2',
+        name: 'Test 2',        
+        config: { key1: 'some default val' },
+        view: '~/hello/world.cshtml',
+        icon: 'helloworld'
+    },
+    {
+        alias: 'Test.Test3',
+        name: 'Test 3',        
+        config: { key1: 'some default val' },
+        view: '/hello/world.html',
+        render: '~/hello/world.cshtml',
+        icon: 'helloworld'
+    }
+]");
+            var parser = ManifestParser.GetGridEditors(a).ToArray();
+
+            Assert.AreEqual(3, parser.Count());
+
+            Assert.AreEqual("Test.Test1", parser.ElementAt(0).Alias);
+            Assert.AreEqual("Test 1", parser.ElementAt(0).Name);
+            Assert.AreEqual("blah", parser.ElementAt(0).View);
+            Assert.AreEqual("hello", parser.ElementAt(0).Icon);
+            Assert.IsNull(parser.ElementAt(0).Render);
+            Assert.AreEqual(0, parser.ElementAt(0).Config.Count);
+
+            Assert.AreEqual("Test.Test2", parser.ElementAt(1).Alias);
+            Assert.AreEqual("Test 2", parser.ElementAt(1).Name);
+            Assert.AreEqual("/hello/world.cshtml", parser.ElementAt(1).View);
+            Assert.AreEqual("helloworld", parser.ElementAt(1).Icon);
+            Assert.IsNull(parser.ElementAt(1).Render);
+            Assert.AreEqual(1, parser.ElementAt(1).Config.Count);
+            Assert.AreEqual("some default val", parser.ElementAt(1).Config["key1"]);
+
+            Assert.AreEqual("Test.Test3", parser.ElementAt(2).Alias);
+            Assert.AreEqual("Test 3", parser.ElementAt(2).Name);
+            Assert.AreEqual("/hello/world.html", parser.ElementAt(2).View);
+            Assert.AreEqual("helloworld", parser.ElementAt(2).Icon);
+            Assert.AreEqual("/hello/world.cshtml", parser.ElementAt(2).Render);
+            Assert.AreEqual(1, parser.ElementAt(2).Config.Count);
+            Assert.AreEqual("some default val", parser.ElementAt(2).Config["key1"]);
+            
+        }
+
         [Test]
         public void Parse_Property_Editors()
         {
@@ -259,6 +314,105 @@ namespace Umbraco.Tests.Manifest
 
         //}
 
+        [Test]
+        public void Create_Manifests_Editors()
+        {
+            var package1 = @"{
+propertyEditors: [], 
+javascript: ['~/test.js', '~/test2.js']}";
+            
+            var package2 = "{css: ['~/style.css', '~/folder-name/sdsdsd/stylesheet.css']}";
+
+            var package3 = @"{
+    'javascript': [    ],
+    'css': [     ],
+    'gridEditors': [
+        {
+            'name': 'Small Hero',
+            'alias': 'small-hero',
+            'view': '/App_Plugins/MyPlugin/small-hero/editortemplate.html',
+            'render': '/Views/Partials/Grid/Editors/SmallHero.cshtml',
+            'icon': 'icon-presentation',
+            'config': {
+                'image': {
+                    'size': {
+                        'width': 1200,
+                        'height': 185
+                    }
+                },
+                'link': {
+                    'maxNumberOfItems': 1,
+                    'minNumberOfItems': 0
+                }
+            }
+        },
+        {
+            'name': 'Document Links By Category',
+            'alias': 'document-links-by-category',
+            'view': '/App_Plugins/MyPlugin/document-links-by-category/editortemplate.html',
+            'render': '/Views/Partials/Grid/Editors/DocumentLinksByCategory.cshtml',
+            'icon': 'icon-umb-members'
+        }
+    ]
+}";
+            var package4 = @"{'propertyEditors': [
+    {
+        alias: 'Test.Test1',
+        name: 'Test 1',        
+        editor: {
+            view: '~/App_Plugins/MyPackage/PropertyEditors/MyEditor.html',
+            valueType: 'int',
+            validation: {
+                'required': true,               
+                'Regex': '\\d*'
+            }
+        },
+        prevalues: {
+				fields: [
+					{
+                        label: 'Some config 1',
+						key: 'key1',
+						view: '~/App_Plugins/MyPackage/PropertyEditors/Views/pre-val1.html',
+						validation: {
+                            required: true
+                        }
+					},
+                    {
+                        label: 'Some config 2',
+						key: 'key2',
+						view: '~/App_Plugins/MyPackage/PropertyEditors/Views/pre-val2.html'
+					}
+				]
+			}
+    }
+]}";
+
+            var package5 = @"{'parameterEditors': [
+    {
+        alias: 'parameter1',
+        name: 'My Parameter',        
+        view: '~/App_Plugins/MyPackage/PropertyEditors/MyEditor.html'
+    },
+    {
+        alias: 'parameter2',
+        name: 'Another parameter',
+        config: { key1: 'some config val' },
+        view: '~/App_Plugins/MyPackage/PropertyEditors/CsvEditor.html'
+    }
+]}";
+
+            var result = ManifestParser.CreateManifests(package1, package2, package3, package4, package5).ToArray();
+            
+            var paramEditors = result.SelectMany(x => ManifestParser.GetParameterEditors(x.ParameterEditors)).ToArray();
+            var propEditors = result.SelectMany(x => ManifestParser.GetPropertyEditors(x.PropertyEditors)).ToArray();
+            var gridEditors = result.SelectMany(x => ManifestParser.GetGridEditors(x.GridEditors)).ToArray();
+            
+            Assert.AreEqual(2, gridEditors.Count());
+            Assert.AreEqual(2, paramEditors.Count());
+            Assert.AreEqual(1, propEditors.Count()); 
+
+        }
+
         [Test]
         public void Create_Manifest_With_Line_Comments()
         {

src/Umbraco.Tests/Migrations/Upgrades/ValidateV7TagsUpgradeTest.cs

@@ -42,14 +42,14 @@ namespace Umbraco.Tests.Migrations.Upgrades
                     "tags1", "tags1",
                     new PropertyTypeCollection(new[]
                     {
-                        new PropertyType("test", DataTypeDatabaseType.Ntext) {Alias = "tags1", Name = "tags1", SortOrder = 1, DataTypeDefinitionId = 1041},
+                        new PropertyType("test", DataTypeDatabaseType.Ntext, "tags1") {Name = "tags1", SortOrder = 1, DataTypeDefinitionId = 1041},
                     }));
                 var contentTypeWith2Tags = MockedContentTypes.CreateSimpleContentType(
                     "tags2", "tags2",
                     new PropertyTypeCollection(new[]
                     {
-                        new PropertyType("test", DataTypeDatabaseType.Ntext) {Alias = "tags1", Name = "tags1", SortOrder = 1, DataTypeDefinitionId = 1041},
-                        new PropertyType("test", DataTypeDatabaseType.Ntext) {Alias = "tags2", Name = "tags2", SortOrder = 1, DataTypeDefinitionId = 1041}
+                        new PropertyType("test", DataTypeDatabaseType.Ntext, "tags1") {Name = "tags1", SortOrder = 1, DataTypeDefinitionId = 1041},
+                        new PropertyType("test", DataTypeDatabaseType.Ntext, "tags2") {Name = "tags2", SortOrder = 1, DataTypeDefinitionId = 1041}
                     }));
 
                 contentTypeRepository.AddOrUpdate(contentTypeWith1Tag);