Merge pull request #147 from AndyButland/u4-2958

Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor
Fixed issue where member type properties would not persist after first save without reloading page
2013-10-05 10:04:08 -07:00 · 2013-10-02 21:20:05 +02:00 · 2013-09-30 16:10:14 +02:00 · 2013-09-30 14:32:06 +02:00 · 2013-09-30 12:39:28 +02:00 · 2013-09-30 12:12:17 +02:00
455 changed files with 16547 additions and 9469 deletions
@@ -0,0 +1,86 @@
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+[Bb]in
+[Db]ebug*/
+obj/
+[Rr]elease*/
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+*.suo
+[sS]ource
+[sS]andbox
+umbraco.config
+*.vs10x
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+src/Umbraco.Web.UI/[Cc]ss/*
+src/Umbraco.Web.UI/App_Code/*
+src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Tests/App_Data/*
+src/Umbraco.Web.UI/[Mm]edia/*
+src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
+src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
+src/Umbraco.Web.UI/[Xx]slt/*
+src/Umbraco.Web.UI/[Ii]mages/*
+src/Umbraco.Web.UI/[Ss]cripts/*
+src/Umbraco.Web.UI/Web.*.config.transformed
+
+umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
+umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+_BuildOutput/*
+build/UmbracoCms.AllBinaries*zip
+build/UmbracoCms.WebPI*zip
+build/UmbracoCms*zip
+build/*.nupkg
+src/Umbraco.Tests/config/applications.config
+src/Umbraco.Tests/config/trees.config
+src/Umbraco.Web.UI/web.config
+*.orig
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+webpihash.txt
+
+node_modules
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+build/_BuildOutput/
+tools/NDepend/
+src/*.vspx
+src/*.psess
+NDependOut/*
+QueryResult.htm
+*.ndproj
@@ -1,70 +0,0 @@
-syntax: regexp
-^src/packages/(?!repositories.config$)
-web.Template.[a-zA-Z0-9]*.Debug.config
-
-syntax: glob
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-[Bb]in
-[Db]ebug*/
-obj/
-[Rr]elease*/
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-*.suo
-[sS]ource
-[sS]andbox
-umbraco.config
-*.vs10x
-App_Data\TEMP\*
-umbraco\presentation\umbraco\plugins\*
-umbraco\presentation\usercontrols\*
-umbraco\presentation\scripts\*
-umbraco\presentation\fonts\*
-umbraco\presentation\css\*
-
-src\Umbraco.Web.UI\[Cc]ss\*
-src\Umbraco.Web.UI\App_Code\*
-src\Umbraco.Web.UI\App_Data\*
-src\Umbraco.Tests\App_Data\*
-src\Umbraco.Web.UI\[Mm]edia\*
-src\Umbraco.Web.UI\[Mm]aster[Pp]ages\*
-src\Umbraco.Web.UI\[Mm]acro[Ss]cripts\*
-src\Umbraco.Web.UI\[Xx]slt\*
-src\Umbraco.Web.UI\[Ii]mages\*
-src\Umbraco.Web.UI\[Ss]cripts\*
-src\Umbraco.Web.UI\Web.*.config.transformed
-
-umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx
-umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx
-_BuildOutput/*
-*.ncrunchsolution
-build/UmbracoCms.AllBinaries*zip
-build/UmbracoCms.WebPI*zip
-build/UmbracoCms*zip
-build/*.nupkg
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-*.orig
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/Views/*.cshtml
-src/Umbraco.Web.UI/Views/*.vbhtml
-src/Umbraco.Tests/config/umbracoSettings.config
-src/Umbraco.Web.UI/App_Plugins/*
-src/Umbraco.Web.UI/Views/*
-src/packages/
-
-src\Umbraco.Web.UI\[W]eb.config
-*.transformed
@@ -1,37 +0,0 @@
-d0aba247db91d1b70c39c6397b965ca370a67497 Sprint-Juno-A
-0b8f67be2ca8faf008151d87f232c698de69e735 Release-4.5.0
-5960c073250926d202861a09472f5f334da6e283 Sprint-Juno-B
-f15d4ff81a8368e9d42788f7e0ae726f7a70a3b1 Release-4.0.3
-283065df4d3c27245267709dd2644a479c4f62a5 Release-4.0.4.2
-ffc34b23e1a03785e4098afa4290d8c03cf10115 Release-4.5.2
-d03fcffb8834a9583a56813bb44b6abbd9f042cc Release-4.6.0
-1809f7b2593270c192cd47bdcfdb392100686f79 4.7.2
-488779dec0ceb1d2874bcef906241b919325c904 4.8.0-beta
-096f20bb0575d6199f20fcb3147b63554e765a74 Release-4.8.0
-8f8a203857886b373148af29edd57460a42940be Release-4.8.1
-de73e687ddf6086ed52b6554676c1632865d07f2 Release-4.9.0
-8d7d8609e2e4b971da99cd97f72132ce85ce3333 Release-4.9.1
-f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0
-20e4dff821d8ac2527a5353618fa1a23ea1d8b34 Release-4.11.0
-7f827760cb49d749616859f528d19dde64807947 Release-4.11.1
-7f827760cb49d749616859f528d19dde64807947 Release-4.11.1
-6eb5f2fb5a88aa29ea544499df9160a1b31b5638 Release-4.11.1
-73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
-73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
-0000000000000000000000000000000000000000 4.11.2
-73711b806a4044dbf0d7d7c095ddfdda23b09932 Release-4.11.2
-77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1
-54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2
-ff3bb24ea0c915878396a6ae27f1ff164e8ac150 Release-6.0.0-beta
-56015ac26f5ab60e3c61b1d09075297b660afa07 Release-6.0.0-RC
-1719fbd857f28b376639ac2aa0abada0ef2e7560 Release-6.0.0
-e02f5aebb87e3f07d27376647756caa9762931d8 Release-4.11.4
-14338b0ab1738fbd8987677ecdb9a73d79fc229d release-4.11.6
-ce47176bc6b9298741783e20f1fe2672c811f744 release-4.11.7
-b247b35d821144849f551e02da8ba719f91d5fb0 Release-6.0.2
-aed55cba29009ad3db48880a7cfb66407ce9805f release-6.0.3
-87cf618a39e38ec58df916d10e6a924de62ae37d release-6.1.0-beta
-0dee9964687ea51ea797984cf7cce3655d6a6558 release-6.0.4
-7670bb47a671a9ecc15118589d8048907ea76241 release-6.1.0-beta2
-953c466faf8fcfd6e85e06ccd04c2346bbdb88a8 release-6.0.6
-8309c3bd6db5885c9ef37e71db0672b8947fcb59 release-6.1.0
@@ -0,0 +1,9 @@
+# The MIT License (MIT) #
+
+Copyright (c) 2013 Umbraco
+
+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.
@@ -0,0 +1,33 @@
+Umbraco CMS
+===========
+## Watch a five minute introduction video ##
+
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+
+## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
+
+**More than 177,000 sites trust Umbraco** 
+
+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 has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
+
+Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
+
+To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
+
+## Downloading ##
+
+The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
+
+## Forums ##
+
+We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
+
+## Contribute to Umbraco ##
+
+If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
+
+## Found a bug? ##
+
+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 for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+
+To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
@@ -1,10 +1,12 @@
@ECHO OFF
-SET release=6.1.1
+SET release=6.1.6
 SET comment=
 SET version=%release%

 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)

+ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
+
 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%

 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
@@ -82,6 +82,7 @@
    <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
    <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
    <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
+   <ConfigsFolder>$(BuildFolder)Configs\</ConfigsFolder>
    <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
    <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
    <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
@@ -197,7 +198,7 @@
  </Target>

  <!-- Copy the transformed web.config file to the root -->
-  <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyXmlDocumentation">
+ <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
    <ItemGroup>
      <WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
    </ItemGroup>
@@ -206,10 +207,28 @@
        DestinationFiles="$(WebAppFolder)Web.config"
        OverwriteReadOnlyFiles="true"
        SkipUnchangedFiles="false" />
+ </Target>
+ 
+ <!-- Copy the config files and rename them to *.config.transform -->
+ <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
+    <ItemGroup>
+     <ConfigFiles Include="$(WebAppFolder)config\*.config" />
+	 <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 -->
-  <Target Name="CopyXmlDocumentation"  DependsOnTargets="CompileProjects">
+  <Target Name="CopyXmlDocumentation"  DependsOnTargets="CleanupPresentation">
    <ItemGroup>
      <XmlDocumentationFiles Include="$(SolutionBinFolder)*.xml" />
    </ItemGroup>
@@ -221,6 +240,17 @@
    <Message Text="CopyXmlDocumentation" />
  </Target>

+  <!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
+  <!-- Also, it places umbraco.XmlSerializers.dll in the root, even though it's also in the bin folder. Kill! -->
+  <Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
+	<ItemGroup>
+		<PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
+		<XmlSerializersDll Include="$(WebAppFolder)umbraco.XmlSerializers.dll" />
+    </ItemGroup>
+	<RemoveDir Directories="@(PresentationFolderToDelete)" />
+    <Delete Files="@(XmlSerializersDll)" />
+  </Target>
+
  <Target Name="CompileProjects" DependsOnTargets="CompileExternalExamineProjects">
    
    <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-16"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms.Core</id>
-        <version>6.0.0-alpha</version>
+        <version>6.2.0</version>
        <title>Umbraco Cms Core Binaries</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -14,58 +14,57 @@
        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
        <language>en-US</language>
        <tags>umbraco</tags>
-		<dependencies>
-            <dependency id="Microsoft.AspNet.Mvc" version="[4.0.20710.0]" />
-			<dependency id="Microsoft.AspNet.WebApi" version="4.0.20710.0" />
-			<dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
-			<dependency id="MiniProfiler" version="2.1.0" />
+        <dependencies>
+            <dependency id="Microsoft.AspNet.Mvc" version="4.0" />
+            <dependency id="Microsoft.AspNet.WebApi" version="4.0" />
+            <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
+            <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
+            <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="xmlrpcnet" version="[2.5.0, 3.0.0)" />
+            <dependency id="ClientDependency" version="[1.7.0, 2.0.0)" />
+            <dependency id="ClientDependency-Mvc" version="[1.7.0, 2.0.0)" />
        </dependencies>
    </metadata>
-	<files>
-		<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\ClientDependency.Core.Mvc.dll" target="lib\ClientDependency.Core.Mvc.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Examine.dll" target="lib\Examine.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Lucene.Net.xml" target="lib\Lucene.Net.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
-		<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" />
-		<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
-		<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.XmlSerializers.dll" target="lib\umbraco.XmlSerializers.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
-	</files>
+    <files>
+        <file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\Examine.dll" target="lib\Examine.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
+        <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\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
+        <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" />
+        <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />		
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
+        <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.XmlSerializers.dll" target="lib\umbraco.XmlSerializers.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
+    </files>
 </package>
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-16"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms</id>
-        <version>6.0.0-alpha</version>
+        <version>6.1.2</version>
        <title>Umbraco Cms</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -10,8 +10,8 @@
        <projectUrl>http://umbraco.com/</projectUrl>
        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Installs Umbraco Cms in your Visual Studio ASP.NET Webforms project</description>
-        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET Webforms project</summary>
+        <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
+        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
        <language>en-US</language>
        <tags>umbraco</tags>
        <dependencies>
@@ -21,14 +21,14 @@
  <files>
 	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="Content\bin\amd64" />
 	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
-	<file src="..\_BuildOutput\WebApp\config\*.config" target="Content\config" />
+	<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
 	<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
 	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" />
 	<file src="..\_BuildOutput\WebApp\masterpages\**" target="Content\masterpages" />
 	<file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
 	<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
 	<file src="..\_BuildOutput\WebApp\usercontrols\**" target="Content\usercontrols" />
-	<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" />
+	<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" exclude="..\_BuildOutput\WebApp\Views\Web.config" />
 	<file src="..\_BuildOutput\WebApp\xslt\**" target="Content\xslt" />
 	<file src="..\_BuildOutput\WebApp\default.aspx" target="Content\default.aspx" />
 	<file src="..\_BuildOutput\WebApp\Web.config" target="Content\Web.config" />
@@ -36,7 +36,7 @@
 	<file src="..\_BuildOutput\WebApp\App_Code\**" target="UmbracoFiles\App_Code" />
 	<file src="..\_BuildOutput\WebApp\App_Data\**" target="UmbracoFiles\App_Data" />
 	<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
-	<file src="..\_BuildOutput\WebApp\config\**" target="UmbracoFiles\config" />
+	<file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\config\splashes" />
 	<file src="..\_BuildOutput\WebApp\install\**" target="UmbracoFiles\install" />
 	<file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
 	<file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
@@ -44,5 +44,6 @@
 	<file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
    <file src="tools\install.ps1" target="tools\install.ps1" />
    <file src="tools\Readme.txt" target="tools\Readme.txt" />
+    <file src="build\**" target="build" />
  </files>
 </package>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CopyAllFilesToSingleFolderForPackageDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForPackageDependsOn>
+	
+	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
+</Project>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CopyAllFilesToSingleFolderForPackageDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForPackageDependsOn>
+	
+	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
+</Project>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CopyAllFilesToSingleFolderForPackageDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForPackageDependsOn>
+	
+	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="AddUmbracoFilesToOutput">
+    <ItemGroup>
+      <UmbracoFiles Include=".\umbraco\**\*;" />
+      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
+        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
+        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
+</Project>
@@ -1,15 +1,19 @@
 A note about running Umbraco from Visual Studio.

-When upgrading your website using nuget a backup of config files and web.config will be created and the files will
-be overwritten with those from the current release. This means that you'll have to merge the files if you made any
-changes to the previous config files.
+When upgrading your website using nuget a backup of config files and web.config will be created. Only the web.config will
+be overwritten by default to ensure that it has the necessary settings from the current release. This means that you'll 
+have to merge the files if you made any changes to the previous config files.
+The config files found in the config folder will usually not be changed for patch releases, so they can usually be skipped,
+but the web.config will have to have its previous "umbracoConfigurationStatus"-appsetting and "umbracoDbDSN" connection string
+copied over (as a minimum).

-It's not possible to create a deploy package from Visual Studio, which contains everything out of the box. This is
-due to a number of files and folders that are not added to the Visual Studio project. These folders include:
-install, umbraco and umbraco_client.
-A custom deploy script will be added in a later release.
+This nuget package includes build targets that extends 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.
+These folders will now be automatically included when creating a deploy package or publishing to the file system:
+umbraco and umbraco_client.

-Please read the release notes on Codeplex:
-http://umbraco.codeplex.com/releases
+Please read the release notes on our.umbraco.org:
+http://our.umbraco.org/contribute/releases

 - Umbraco
@@ -17,7 +17,8 @@
    </PropertyGroup>
    
    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
        <!--
            <PackageSource Include="https://nuget.org/api/v2/" />
            <PackageSource Include="https://my-nuget-source/nuget/" />
@@ -54,10 +55,10 @@
        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>

        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
            RestorePackages;
-            $(ResolveReferencesDependsOn);
-        </ResolveReferencesDependsOn>
+            $(BuildDependsOn);
+        </BuildDependsOn>

        <!-- Make the build depend on restore packages -->
        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
@@ -75,7 +76,7 @@
        This effectively acts as a lock that makes sure that the download operation will only happen once and all
        parallel builds will have to wait for it to complete.
        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
    </Target>

    <Target Name="_DownloadNuGet">
@@ -31,6 +31,7 @@ namespace Umbraco.Core.Cache
        public const string UserContextCacheKey = "UmbracoUserContext";
        public const string UserContextTimeoutCacheKey = "UmbracoUserContextTimeout";
        public const string UserCacheKey = "UmbracoUser";
+        public const string UserPermissionsCacheKey = "UmbracoUserPermissions";

        public const string ContentTypeCacheKey = "UmbracoContentType";

@@ -8,7 +8,7 @@ namespace Umbraco.Core.Cache
    /// An abstract class for implementing a runtime cache provider
    /// </summary>
    /// <remarks>
-    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, ETC...
+    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, REQUEST CACHE, ETC...
    /// </remarks>
    internal abstract class RuntimeCacheProviderBase : CacheProviderBase
    {
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Web;
 using System.Web.Caching;
+using System.Web.Security;
 using System.Xml;
 using System.Configuration;

@@ -299,6 +300,32 @@ namespace Umbraco.Core.Configuration
            }
        }

+        internal static string AuthCookieName
+        {
+            get
+            {
+                var value = GetKey("/settings/security/authCookieName");
+                if (string.IsNullOrEmpty(value) == false)
+                {
+                    return value;
+                }
+                return "UMB_UCONTEXT";
+            }
+        }
+
+        internal static string AuthCookieDomain
+        {
+            get
+            {
+                var value = GetKey("/settings/security/authCookieDomain");
+                if (string.IsNullOrEmpty(value) == false)
+                {
+                    return value;
+                }
+                return FormsAuthentication.CookieDomain;
+            }
+        }
+
        /// <summary>
        /// Enables the experimental canvas (live) editing on the frontend of the website
        /// </summary>
@@ -1305,6 +1332,25 @@ namespace Umbraco.Core.Configuration
 			}
 		}

+        /// <summary>
+        /// Gets the default document type property used when adding new properties through the back-office
+        /// </summary>
+        /// <value>Configured text for the default document type property</value>
+        /// <remarks>If undefined, 'Textstring' is the default</remarks>
+        public static string DefaultDocumentTypeProperty
+        {
+            get 
+            {
+                var defaultDocumentTypeProperty = GetKey("/settings/content/defaultDocumentTypeProperty");
+                if (string.IsNullOrEmpty(defaultDocumentTypeProperty))
+                {
+                    defaultDocumentTypeProperty = "Textstring";
+                }
+
+                return defaultDocumentTypeProperty;
+            }
+        }
+
 		/// <summary>
 		/// Configuration regarding webservices
 		/// </summary>
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("6.1.1");
+        private static readonly Version Version = new Version("6.1.6");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -112,7 +112,7 @@ namespace Umbraco.Core
        public void ConfigureEmbeddedDatabaseConnection()
        {
            const string providerName = "System.Data.SqlServerCe.4.0";
-            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf";
+            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;";

            SaveConnectionString(connectionString, providerName);

@@ -169,6 +169,20 @@ namespace Umbraco.Core
            Initialize(providerName);
        }

+        /// <summary>
+        /// Configures a ConnectionString for the Umbraco database that uses Microsoft SQL Server integrated security.
+        /// </summary>
+        /// <param name="server">Name or address of the database server</param>
+        /// <param name="databaseName">Name of the database</param>
+        public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
+        {
+            const string providerName = "System.Data.SqlClient";
+            string connectionString = String.Format("Server={0};Database={1};Integrated Security=true", server, databaseName);
+
+            SaveConnectionString(connectionString, providerName);
+            Initialize(providerName);
+        }
+
        internal string BuildAzureConnectionString(string server, string databaseName, string user, string password)
        {
            if (server.Contains(".") && ServerStartsWithTcp(server) == false)
@@ -282,16 +296,15 @@ namespace Umbraco.Core
            if (databaseSettings != null && string.IsNullOrWhiteSpace(databaseSettings.ConnectionString) == false && string.IsNullOrWhiteSpace(databaseSettings.ProviderName) == false)
            {
                var providerName = "System.Data.SqlClient";
+                string connString = null;
                if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
                {
                    providerName = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName;
-
-                    _connectionString =
-                        ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
-
+                    connString = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
                }
+                Initialize(providerName, connString);

-                Initialize(providerName);
+                DetermineSqlServerVersion();
            }
            else if (ConfigurationManager.AppSettings.ContainsKey(GlobalSettings.UmbracoConnectionName) && string.IsNullOrEmpty(ConfigurationManager.AppSettings[GlobalSettings.UmbracoConnectionName]) == false)
            {
@@ -328,6 +341,8 @@ namespace Umbraco.Core

                //Remove the legacy connection string, so we don't end up in a loop if something goes wrong.
                GlobalSettings.RemoveSetting(GlobalSettings.UmbracoConnectionName);
+
+                DetermineSqlServerVersion();
            }
            else
            {
@@ -355,6 +370,55 @@ namespace Umbraco.Core
            }
        }

+        internal void Initialize(string providerName, string connectionString)
+        {
+            _connectionString = connectionString;
+            Initialize(providerName);
+        }
+
+        /// <summary>
+        /// Set the lazy resolution of determining the SQL server version if that is the db type we're using
+        /// </summary>
+        private void DetermineSqlServerVersion()
+        {
+            
+            var sqlServerSyntax = SqlSyntaxContext.SqlSyntaxProvider as SqlServerSyntaxProvider;
+            if (sqlServerSyntax != null)
+            {
+                //this will not execute now, it is lazy so will only execute when we need to actually know
+                // the sql server version.
+                sqlServerSyntax.VersionName = new Lazy<SqlServerVersionName>(() =>
+                {
+                    try
+                    {
+                        var database = this._factory.CreateDatabase();
+
+                        var version = database.ExecuteScalar<string>("SELECT SERVERPROPERTY('productversion')");
+                        var firstPart = version.Split('.')[0];
+                        switch (firstPart)
+                        {
+                            case "11":
+                                return SqlServerVersionName.V2012;
+                            case "10":
+                                return SqlServerVersionName.V2008;
+                            case "9":
+                                return SqlServerVersionName.V2005;
+                            case "8":
+                                return SqlServerVersionName.V2000;
+                            case "7":
+                                return SqlServerVersionName.V7;
+                            default:
+                                return SqlServerVersionName.Other;
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        return SqlServerVersionName.Invalid;
+                    }
+                });
+            }
+        }
+
        internal DatabaseSchemaResult ValidateDatabaseSchema()
        {
            if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
@@ -393,8 +457,8 @@ namespace Umbraco.Core
                if (supportsCaseInsensitiveQueries  == false)
                {
                    message = "<p>&nbsp;</p><p>The database you're trying to use does not support case insensitive queries. <br />We currently do not support these types of databases.</p>" +
-                              "<p>You can fix this by changing the following two settings in your my.ini file in your MySQL installation directory:</p>" +
-                              "<pre>lower_case_table_names=1\nlower_case_file_system=1</pre><br />" +
+                              "<p>You can fix this by changing the following setting in your my.ini file in your MySQL installation directory:</p>" +
+                              "<pre>lower_case_table_names=1</pre><br />" +
                              "<p>Note: Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
                              "<p>For more technical information on case sensitivity in MySQL, have a look at " +
                              "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
@@ -404,8 +468,8 @@ namespace Umbraco.Core
                else if (supportsCaseInsensitiveQueries == null)
                {
                    message = "<p>&nbsp;</p><p>Warning! Could not check if your database type supports case insensitive queries. <br />We currently do not support these databases that do not support case insensitive queries.</p>" +
-                              "<p>You can check this by looking for the following two settings in your my.ini file in your MySQL installation directory:</p>" +
-                              "<pre>lower_case_table_names=1\nlower_case_file_system=1</pre><br />" +
+                              "<p>You can check this by looking for the following setting in your my.ini file in your MySQL installation directory:</p>" +
+                              "<pre>lower_case_table_names=1</pre><br />" +
                              "<p>Note: Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
                              "<p>For more technical information on case sensitivity in MySQL, have a look at " +
                              "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
@@ -418,8 +482,8 @@ namespace Umbraco.Core
                                  "<p>Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.</p>" +
                                  "<p>However, your hosting provider may not support this option. Umbraco does not currently support MySQL installs that do not support case insensitive queries</p>" +
                                  "<p>Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
-                                  "<p>They can check this by looking for the following two settings in the my.ini file in their MySQL installation directory:</p>" +
-                                  "<pre>lower_case_table_names=1\nlower_case_file_system=1</pre><br />" +
+                                  "<p>They can check this by looking for the following setting in the my.ini file in their MySQL installation directory:</p>" +
+                                  "<pre>lower_case_table_names=1</pre><br />" +
                                  "<p>For more technical information on case sensitivity in MySQL, have a look at " +
                                  "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
                    }
@@ -446,6 +510,8 @@ namespace Umbraco.Core
                    message = message + "<p>Upgrade completed!</p>";
                }

+                //now that everything is done, we need to determine the version of SQL server that is executing
+
                LogHelper.Info<DatabaseContext>("Database configuration status: " + message);

                return new Result { Message = message, Success = true, Percentage = "100" };
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core
+{
+    public static class DateTimeExtensions
+    {
+
+        /// <summary>
+        /// Returns the DateTime as an ISO formatted string that is globally expectable
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <returns></returns>
+        public static string ToIsoString(this DateTime dt)
+        {
+            return dt.ToString("yyyy-MM-dd HH:mm:ss");
+        }
+
+    }
+}
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    public class RecycleBinEventArgs : CancellableEventArgs
+    {
+        public RecycleBinEventArgs(Guid nodeObjectType, IEnumerable<int> ids, List<string> files, bool emptiedSuccessfully)
+            : base(false)
+        {
+            NodeObjectType = nodeObjectType;
+            Ids = ids;
+            Files = files;
+            RecycleBinEmptiedSuccessfully = emptiedSuccessfully;
+        }
+
+        public RecycleBinEventArgs(Guid nodeObjectType, IEnumerable<int> ids, List<string> files)
+            : base(true)
+        {
+            NodeObjectType = nodeObjectType;
+            Ids = ids;
+            Files = files;
+        }
+
+        /// <summary>
+        /// Gets the Id of the node object type of the items 
+        /// being deleted from the Recycle Bin.
+        /// </summary>
+        public Guid NodeObjectType { get; private set; }
+        
+        /// <summary>
+        /// Gets the list of Ids for each of the items being deleted from the Recycle Bin.
+        /// </summary>
+        public IEnumerable<int> Ids { get; private set; }
+
+        /// <summary>
+        /// Gets the list of Files that should be deleted as part
+        /// of emptying the Recycle Bin.
+        /// </summary>
+        public List<string> Files { get; private set; }
+
+        /// <summary>
+        /// Boolean indicating whether the Recycle Bin was emptied successfully
+        /// </summary>
+        public bool RecycleBinEmptiedSuccessfully { get; private set; }
+
+        /// <summary>
+        /// Boolean indicating whether this event was fired for the Content's Recycle Bin.
+        /// </summary>
+        public bool IsContentRecycleBin
+        {
+            get { return NodeObjectType == new Guid(Constants.ObjectTypes.Document); }
+        }
+
+        /// <summary>
+        /// Boolean indicating whether this event was fired for the Media's Recycle Bin.
+        /// </summary>
+        public bool IsMediaRecycleBin
+        {
+            get { return NodeObjectType == new Guid(Constants.ObjectTypes.Media); }
+        }
+    }
+}
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Any class implementing this interface that is added to the httpcontext.items keys or values will be disposed of at the end of the request.
+    /// </summary>
+    public interface IDisposeOnRequestEnd : IDisposable
+    {
+    }
+}
@@ -45,6 +45,8 @@ namespace Umbraco.Core.IO
        {
            if (virtualPath.StartsWith("~"))
                return virtualPath.Replace("~", SystemDirectories.Root).Replace("//", "/");
+            else if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
+                return virtualPath;
            else
                return VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root);
        }
@@ -249,6 +251,32 @@ namespace Umbraco.Core.IO
            return _rootDir;
        }

+        internal static string GetRootDirectoryBinFolder()
+        {
+            string binFolder = string.Empty;
+            if (string.IsNullOrEmpty(_rootDir))
+            {
+                binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory.FullName;
+                return binFolder;
+            }
+
+            binFolder = Path.Combine(GetRootDirectorySafe(), "bin");
+
+#if DEBUG
+            var debugFolder = Path.Combine(binFolder, "debug");
+            if (Directory.Exists(debugFolder))
+                return debugFolder;
+#endif   
+            var releaseFolder = Path.Combine(binFolder, "release");
+            if (Directory.Exists(releaseFolder))
+                return releaseFolder;
+
+            if (Directory.Exists(binFolder))
+                return binFolder;
+
+            return _rootDir;
+        }
+
        /// <summary>
        /// Allows you to overwrite RootDirectory, which would otherwise be resolved
        /// automatically upon application start.
@@ -0,0 +1,20 @@
+namespace Umbraco.Core.IO
+{
+    internal class ResizedImage
+    {
+        public ResizedImage()
+        {
+        }
+
+        public ResizedImage(int width, int height, string fileName)
+        {
+            Width = width;
+            Height = height;
+            FileName = fileName;
+        }
+
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public string FileName { get; set; }
+    }
+}
@@ -0,0 +1,253 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Core.IO
+{
+    public class UmbracoMediaFile
+    {
+        private readonly MediaFileSystem _fs;
+
+        #region Constructors
+
+        public UmbracoMediaFile()
+        {
+            _fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+        }
+
+        public UmbracoMediaFile(string path)
+        {
+            _fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+
+            Path = path;
+
+            Initialize();
+        }
+
+        #endregion
+
+        #region Static Methods
+
+        //MB: Do we really need all these overloads? looking through the code, only one of them is actually used
+
+        public static UmbracoMediaFile Save(HttpPostedFile file, string path)
+        {
+            return Save(file.InputStream, path);
+        }
+
+        public static UmbracoMediaFile Save(HttpPostedFileBase file, string path)
+        {
+            return Save(file.InputStream, path);
+        }
+
+        public static UmbracoMediaFile Save(Stream inputStream, string path)
+        {
+            var fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+            fs.AddFile(path, inputStream);
+
+            return new UmbracoMediaFile(path);
+        }
+
+        public static UmbracoMediaFile Save(byte[] file, string relativePath)
+        {
+            return Save(new MemoryStream(file), relativePath);
+        }
+
+        public static UmbracoMediaFile Save(HttpPostedFile file)
+        {
+            var tempDir = System.IO.Path.Combine("uploads", Guid.NewGuid().ToString());
+            return Save(file, tempDir);
+        }
+
+        //filebase overload...
+        public static UmbracoMediaFile Save(HttpPostedFileBase file)
+        {
+            var tempDir = System.IO.Path.Combine("uploads", Guid.NewGuid().ToString());
+            return Save(file, tempDir);
+        }
+
+        #endregion
+
+        private long? _length;
+        private Size? _size;
+
+        /// <summary>
+        /// Initialized values that don't require opening the file.
+        /// </summary>
+        private void Initialize()
+        {
+            Filename = _fs.GetFileName(Path);
+            Extension = _fs.GetExtension(Path) != null
+                ? _fs.GetExtension(Path).Substring(1).ToLowerInvariant()
+                : "";
+            Url = _fs.GetUrl(Path);
+        }
+
+        public string Filename { get; private set; }
+
+        public string Extension { get; private set; }
+
+        public string Path { get; private set; }
+
+        public string Url { get; private set; }
+
+        /// <summary>
+        /// Get the length of the file in bytes
+        /// </summary>
+        /// <remarks>
+        /// We are lazy loading this, don't go opening the file on ctor like we were doing.
+        /// </remarks>
+        public long Length
+        {
+            get
+            {
+                if (_length == null)
+                {
+                    _length = _fs.GetSize(Path);
+                }
+                return _length.Value;
+            }
+        }
+
+        public bool SupportsResizing
+        {
+            get
+            {
+                return ("," + UmbracoSettings.ImageFileTypes + ",").Contains(string.Format(",{0},", Extension));
+            }
+        }
+
+        public string GetFriendlyName()
+        {
+            return Filename.SplitPascalCasing().ToFirstUpperInvariant();
+        }
+
+        public Size GetDimensions()
+        {
+            if (_size == null)
+            {
+                EnsureFileSupportsResizing();
+
+                var fs = _fs.OpenFile(Path);
+                var image = Image.FromStream(fs);
+                var fileWidth = image.Width;
+                var fileHeight = image.Height;
+                fs.Close();
+                image.Dispose();
+
+                _size = new Size(fileWidth, fileHeight);    
+            }
+            return _size.Value;
+        }
+
+        public string Resize(int width, int height)
+        {
+            EnsureFileSupportsResizing();
+
+            var fileNameThumb = DoResize(width, height, 0, string.Empty);
+
+            return _fs.GetUrl(fileNameThumb);
+        }
+
+        public string Resize(int maxWidthHeight, string fileNameAddition)
+        {
+            EnsureFileSupportsResizing();
+
+            var fileNameThumb = DoResize(GetDimensions().Width, GetDimensions().Height, maxWidthHeight, fileNameAddition);
+
+            return _fs.GetUrl(fileNameThumb);
+        }
+
+        private string DoResize(int width, int height, int maxWidthHeight, string fileNameAddition)
+        {
+            using (var fs = _fs.OpenFile(Path))
+            {
+                using (var image = Image.FromStream(fs))
+                {
+                    var fileNameThumb = string.IsNullOrWhiteSpace(fileNameAddition)
+                        ? string.Format("{0}_UMBRACOSYSTHUMBNAIL.jpg", Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)))
+                        : string.Format("{0}_{1}.jpg", Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)), fileNameAddition);
+
+                    var thumbnail = GenerateThumbnail(image, maxWidthHeight, width, height, fileNameThumb, maxWidthHeight == 0);
+
+                    return thumbnail.FileName;
+                }
+            }
+        }
+
+        private void EnsureFileSupportsResizing()
+        {
+            if (SupportsResizing == false)
+                throw new InvalidOperationException(string.Format("The file {0} is not an image, so can't get dimensions", Filename));
+        }
+
+        private ResizedImage GenerateThumbnail(Image image, int maxWidthHeight, int fileWidth, int fileHeight, string thumbnailFileName, bool useFixedDimensions)
+        {
+            // Generate thumbnail
+            float f = 1;
+            if (useFixedDimensions == false)
+            {
+                var fx = (float)image.Size.Width / (float)maxWidthHeight;
+                var fy = (float)image.Size.Height / (float)maxWidthHeight;
+
+                // must fit in thumbnail size
+                f = Math.Max(fx, fy);
+            }
+
+            var widthTh = (int)Math.Round((float)fileWidth / f);
+            var heightTh = (int)Math.Round((float)fileHeight / f);
+
+            // fixes for empty width or height
+            if (widthTh == 0)
+                widthTh = 1;
+            if (heightTh == 0)
+                heightTh = 1;
+
+            // Create new image with best quality settings
+            using (var bp = new Bitmap(widthTh, heightTh))
+            {
+                using (var g = Graphics.FromImage(bp))
+                {
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+                    g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                    g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                    g.CompositingQuality = CompositingQuality.HighQuality;
+
+                    // Copy the old image to the new and resized
+                    var rect = new Rectangle(0, 0, widthTh, heightTh);
+                    g.DrawImage(image, rect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel);
+
+                    // Copy metadata
+                    var imageEncoders = ImageCodecInfo.GetImageEncoders();
+
+                    var codec = Extension.ToLower() == "png" || Extension.ToLower() == "gif"
+                        ? imageEncoders.Single(t => t.MimeType.Equals("image/png"))
+                        : imageEncoders.Single(t => t.MimeType.Equals("image/jpeg"));
+
+                    // Set compresion ratio to 90%
+                    var ep = new EncoderParameters();
+                    ep.Param[0] = new EncoderParameter(Encoder.Quality, 90L);
+
+                    // Save the new image using the dimensions of the image
+                    var newFileName = thumbnailFileName.Replace("UMBRACOSYSTHUMBNAIL", string.Format("{0}x{1}", widthTh, heightTh));
+                    using (var ms = new MemoryStream())
+                    {
+                        bp.Save(ms, codec, ep);
+                        ms.Seek(0, 0);
+
+                        _fs.AddFile(newFileName, ms);
+                    }
+
+                    return new ResizedImage(widthTh, heightTh, newFileName);
+                }
+            }
+        }
+    }
+}
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Models
        private DateTime? _expireDate;
        private int _writer;
        private string _nodeName;//NOTE Once localization is introduced this will be the non-localized Node Name.
-
+        private bool _permissionsChanged;
        /// <summary>
        /// Constructor for creating a Content object
        /// </summary>
@@ -82,6 +82,7 @@ namespace Umbraco.Core.Models
        private static readonly PropertyInfo ExpireDateSelector = ExpressionHelper.GetPropertyInfo<Content, DateTime?>(x => x.ExpireDate);
        private static readonly PropertyInfo WriterSelector = ExpressionHelper.GetPropertyInfo<Content, int>(x => x.WriterId);
        private static readonly PropertyInfo NodeNameSelector = ExpressionHelper.GetPropertyInfo<Content, string>(x => x.NodeName);
+        private static readonly PropertyInfo PermissionsChangedSelector = ExpressionHelper.GetPropertyInfo<Content, bool>(x => x.PermissionsChanged);

        /// <summary>
        /// Gets or sets the template used by the Content.
@@ -138,7 +139,10 @@ namespace Umbraco.Core.Models
        /// <summary>
        /// Boolean indicating whether this Content is Published or not
        /// </summary>
-        /// <remarks>Setting Published to true/false should be private or internal</remarks>
+        /// <remarks>
+        /// Setting Published to true/false should be private or internal and should ONLY be used for wiring up the value
+        /// from the db or modifying it based on changing the published state.
+        /// </remarks>
        [DataMember]
        public bool Published
        {
@@ -243,6 +247,22 @@ namespace Umbraco.Core.Models
            }
        }

+        /// <summary>
+        /// Used internally to track if permissions have been changed during the saving process for this entity
+        /// </summary>
+        internal bool PermissionsChanged
+        {
+            get { return _permissionsChanged; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _permissionsChanged = value;
+                    return _permissionsChanged;
+                }, _permissionsChanged, PermissionsChangedSelector);
+            }
+        }
+
        /// <summary>
        /// Gets the ContentType used by this content object
        /// </summary>
@@ -355,11 +375,25 @@ namespace Umbraco.Core.Models
        /// <returns>True if entity is dirty, otherwise False</returns>
        public override bool IsDirty()
        {
-            bool dirtyEntity = base.IsDirty();
+            return IsEntityDirty() || IsAnyUserPropertyDirty();
+        }

-            bool dirtyProperties = Properties.Any(x => x.IsDirty());
+        /// <summary>
+        /// Returns true if only the entity properties are direty
+        /// </summary>
+        /// <returns></returns>
+        internal bool IsEntityDirty()
+        {
+            return base.IsDirty();
+        }

-            return dirtyEntity || dirtyProperties;
+        /// <summary>
+        /// Returns true if any of the properties are dirty
+        /// </summary>
+        /// <returns></returns>
+        internal bool IsAnyUserPropertyDirty()
+        {
+            return Properties.Any(x => x.IsDirty());
        }

        /// <summary>
@@ -27,6 +27,7 @@ namespace Umbraco.Core.Models
        private bool _trashed;
        private int _contentTypeId;
        private PropertyCollection _properties;
+        private readonly List<Property> _lastInvalidProperties = new List<Property>();

        /// <summary>
        /// Protected constructor for ContentBase (Base for Content and Media)
@@ -292,7 +293,10 @@ namespace Umbraco.Core.Models
        /// <returns><see cref="Property"/> Value as a <see cref="TPassType"/></returns>
        public virtual TPassType GetValue<TPassType>(string propertyTypeAlias)
        {
-            return (TPassType)Properties[propertyTypeAlias].Value;
+            if (Properties[propertyTypeAlias].Value is TPassType)
+                return (TPassType)Properties[propertyTypeAlias].Value;
+
+            return (TPassType)Convert.ChangeType(Properties[propertyTypeAlias].Value, typeof(TPassType));
        }

        /// <summary>
@@ -421,9 +425,34 @@ namespace Umbraco.Core.Models
        /// <returns>True if content is valid otherwise false</returns>
        public virtual bool IsValid()
        {
-            return Properties.Any(property => !property.IsValid()) == false;
+            _lastInvalidProperties.Clear();
+            _lastInvalidProperties.AddRange(Properties.Where(property => property.IsValid() == false));
+            return _lastInvalidProperties.Any() == false;
+        }
+
+        /// <summary>
+        /// Returns a collection of the result of the last validation process, this collection contains all invalid properties.
+        /// </summary>
+        internal IEnumerable<Property> LastInvalidProperties
+        {
+            get { return _lastInvalidProperties; }
        }

        public abstract void ChangeTrashedState(bool isTrashed, int parentId = -20);
+
+        /// <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)
+        /// </summary>
+        /// <param name="rememberPreviouslyChangedProperties"></param>
+        internal override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        {
+            base.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+
+            foreach (var prop in Properties)
+            {
+                prop.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+            }
+        }
    }
 }
@@ -12,16 +12,119 @@ using System.Xml.Linq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Media;
+using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Services;

 namespace Umbraco.Core.Models
 {
    public static class ContentExtensions
    {
        #region IContent
+
+        /// <summary>
+        /// Determines if a new version should be created
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// A new version needs to be created when:
+        /// * The publish status is changed
+        /// * The language is changed
+        /// * The item is already published and is being published again and any property value is changed (to enable a rollback)
+        /// </remarks>
+        internal static bool ShouldCreateNewVersion(this IContent entity)
+        {
+            var publishedState = ((Content)entity).PublishedState;
+            return ShouldCreateNewVersion(entity, publishedState);
+        }
+
+        /// <summary>
+        /// Determines if a new version should be created
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="publishedState"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// A new version needs to be created when:
+        /// * The publish status is changed
+        /// * The language is changed
+        /// * The item is already published and is being published again and any property value is changed (to enable a rollback)
+        /// </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 contentChanged =
+                (dirtyEntity.IsPropertyDirty("Published") && publishedState != PublishedState.Unpublished)
+                || dirtyEntity.IsPropertyDirty("Language");
+
+            //return true if published or language has changed
+            if (contentChanged)
+            {
+                return true;
+            }
+
+            //check if any user prop has changed
+            var propertyValueChanged = ((Content) entity).IsAnyUserPropertyDirty();
+            //check if any content prop has changed
+            var contentDataChanged = ((Content) entity).IsEntityDirty();
+
+            //return true if the item is published and a property has changed or if any content property has changed
+            return (propertyValueChanged && publishedState == PublishedState.Published) || contentDataChanged;
+        }
+
+        /// <summary>
+        /// Determines if the published db flag should be set to true for the current entity version and all other db
+        /// versions should have their flag set to false.
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is determined by:
+        /// * If a new version is being created and the entity is published
+        /// * If the published state has changed and the entity is published OR the entity has been un-published.
+        /// </remarks>
+        internal static bool ShouldClearPublishedFlagForPreviousVersions(this IContent entity)
+        {
+            var publishedState = ((Content)entity).PublishedState;
+            return entity.ShouldClearPublishedFlagForPreviousVersions(publishedState, entity.ShouldCreateNewVersion(publishedState));
+        }
+
+        /// <summary>
+        /// Determines if the published db flag should be set to true for the current entity version and all other db
+        /// versions should have their flag set to false.
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="publishedState"></param>
+        /// <param name="isCreatingNewVersion"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is determined by:
+        /// * If a new version is being created and the entity is published
+        /// * If the published state has changed and the entity is published OR the entity has been un-published.
+        /// </remarks>
+        internal static bool ShouldClearPublishedFlagForPreviousVersions(this IContent entity, PublishedState publishedState, bool isCreatingNewVersion)
+        {
+            if (isCreatingNewVersion && entity.Published)
+            {
+                return true;
+            }
+
+            //If Published state has changed then previous versions should have their publish state reset.
+            //If state has been changed to unpublished the previous versions publish state should also be reset.
+            if (((ICanBeDirty)entity).IsPropertyDirty("Published") && (entity.Published || publishedState == PublishedState.Unpublished))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
        /// <summary>
        /// Returns a list of the current contents ancestors, not including the content itself.
        /// </summary>
@@ -105,6 +208,50 @@ namespace Umbraco.Core.Models
        }
        #endregion

+        /// <summary>
+        /// Checks if the IContentBase has children
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is a bit of a hack because we need to type check!
+        /// </remarks>
+        internal static bool HasChildren(IContentBase content, ServiceContext services)
+        {
+            if (content is IContent)
+            {
+                return services.ContentService.HasChildren(content.Id);
+            }
+            if (content is IMedia)
+            {
+                return services.MediaService.HasChildren(content.Id);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the children for the content base item
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is a bit of a hack because we need to type check!
+        /// </remarks>
+        internal static IEnumerable<IContentBase> Children(IContentBase content, ServiceContext services)
+        {
+            if (content is IContent)
+            {
+                return services.ContentService.GetChildren(content.Id);
+            }
+            if (content is IMedia)
+            {
+                return services.MediaService.GetChildren(content.Id);
+            }
+            return null;
+        }
+
        /// <summary>
        /// Set property values by alias with an annonymous object
        /// </summary>
@@ -467,38 +614,7 @@ namespace Umbraco.Core.Models
        /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
        internal static XElement ToDeepXml(this IContent content)
        {
-            var xml = content.ToXml();
-            
-            var descendants = content.Descendants().ToArray();
-            var currentChildren = descendants.Where(x => x.ParentId == content.Id);
-            AddChildXml(descendants, currentChildren, xml);      
-
-            return xml;
-        }
-
-        /// <summary>
-        /// Used by ToDeepXml to recursively add children
-        /// </summary>
-        /// <param name="originalDescendants"></param>
-        /// <param name="currentChildren"></param>
-        /// <param name="currentXml"></param>
-        private static void AddChildXml(
-            IContent[] originalDescendants, 
-            IEnumerable<IContent> currentChildren, 
-            XElement currentXml)
-        {
-            foreach (var child in currentChildren)
-            {
-                //add the child's xml
-                var childXml = child.ToXml();
-                currentXml.Add(childXml);
-                //copy local (out of closure)
-                var c = child;
-                //get this item's children                
-                var children = originalDescendants.Where(x => x.ParentId == c.Id);
-                //recurse and add it's children to the child xml element
-                AddChildXml(originalDescendants, children, childXml);
-            }
+            return ApplicationContext.Current.Services.PackagingService.Export(content, true);
        }

        /// <summary>
@@ -508,18 +624,7 @@ namespace Umbraco.Core.Models
        /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
        public static XElement ToXml(this IContent content)
        {
-			//nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
-			var nodeName = UmbracoSettings.UseLegacyXmlSchema ? "node" : content.ContentType.Alias.ToSafeAliasWithForcingCheck();
-
-            var x = content.ToXml(nodeName);
-            x.Add(new XAttribute("nodeType", content.ContentType.Id));
-            x.Add(new XAttribute("creatorName", content.GetCreatorProfile().Name));
-            x.Add(new XAttribute("writerName", content.GetWriterProfile().Name));
-            x.Add(new XAttribute("writerID", content.WriterId));
-            x.Add(new XAttribute("template", content.Template == null ? "0" : content.Template.Id.ToString()));
-            x.Add(new XAttribute("nodeTypeAlias", content.ContentType.Alias));
-
-            return x;
+            return ApplicationContext.Current.Services.PackagingService.Export(content);
        }

        /// <summary>
@@ -529,49 +634,13 @@ namespace Umbraco.Core.Models
        /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
        public static XElement ToXml(this IMedia media)
        {
-            //nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
-            var nodeName = UmbracoSettings.UseLegacyXmlSchema ? "node" : media.ContentType.Alias.ToSafeAliasWithForcingCheck();
-
-            var x = media.ToXml(nodeName);
-            x.Add(new XAttribute("nodeType", media.ContentType.Id));
-            x.Add(new XAttribute("writerName", media.GetCreatorProfile().Name));
-            x.Add(new XAttribute("writerID", media.CreatorId));
-            x.Add(new XAttribute("version", media.Version));
-            x.Add(new XAttribute("template", 0));
-            x.Add(new XAttribute("nodeTypeAlias", media.ContentType.Alias));
-
-            return x;
+            return ApplicationContext.Current.Services.PackagingService.Export(media);
        }

-        /// <summary>
-        /// Creates the xml representation for the <see cref="IContentBase"/> object
-        /// </summary>
-        /// <param name="contentBase"><see cref="IContent"/> to generate xml for</param>
-        /// <param name="nodeName"></param>
-        /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
-        private static XElement ToXml(this IContentBase contentBase, string nodeName)
+        internal static XElement ToDeepXml(this IMedia media)
        {
-            // note: that one will take care of umbracoUrlName
-            var url = contentBase.GetUrlSegment();
-
-			var xml = new XElement(nodeName,
-                                   new XAttribute("id", contentBase.Id),
-                                   new XAttribute("parentID", contentBase.Level > 1 ? contentBase.ParentId : -1),
-                                   new XAttribute("level", contentBase.Level),
-                                   new XAttribute("creatorID", contentBase.CreatorId),
-                                   new XAttribute("sortOrder", contentBase.SortOrder),
-                                   new XAttribute("createDate", contentBase.CreateDate.ToString("s")),
-                                   new XAttribute("updateDate", contentBase.UpdateDate.ToString("s")),
-                                   new XAttribute("nodeName", contentBase.Name),
-                                   new XAttribute("urlName", url),
-                                   new XAttribute("path", contentBase.Path),
-                                   new XAttribute("isDoc", ""));
-
-            foreach (var property in contentBase.Properties.Where(p => p != null))
-				xml.Add(property.ToXml());
-
-			return xml;
-		}
+            return ApplicationContext.Current.Services.PackagingService.Export(media, true);
+        }

        /// <summary>
        /// Creates the xml representation for the <see cref="IContent"/> object
@@ -181,6 +181,38 @@ namespace Umbraco.Core.Models
            }
        }

+        /// <summary>
+        /// Creates a clone of the current entity
+        /// </summary>
+        /// <returns></returns>
+        public IContentType Clone(string alias)
+        {
+            var clone = (ContentType)this.MemberwiseClone();
+            clone.Alias = alias;
+            clone.Key = Guid.Empty;
+            var propertyGroups = this.PropertyGroups.Select(x => x.Clone()).ToList();
+            clone.PropertyGroups = new PropertyGroupCollection(propertyGroups);
+            clone.PropertyTypes = this.PropertyTypeCollection.Select(x => x.Clone()).ToList();
+            clone.ResetIdentity();
+            clone.ResetDirtyProperties(false);
+
+            foreach (var propertyGroup in clone.PropertyGroups)
+            {
+                propertyGroup.ResetIdentity();
+                foreach (var propertyType in propertyGroup.PropertyTypes)
+                {
+                    propertyType.ResetIdentity();
+                }
+            }
+
+            foreach (var propertyType in clone.PropertyTypes.Where(x => x.HasIdentity))
+            {
+                propertyType.ResetIdentity();
+            }
+
+            return clone;
+        }
+
        /// <summary>
        /// Method to call when Entity is being saved
        /// </summary>
@@ -477,6 +477,15 @@ namespace Umbraco.Core.Models
            }
        }

+        /// <summary>
+        /// Removes a PropertyGroup from the current ContentType
+        /// </summary>
+        /// <param name="propertyGroupName">Name of the <see cref="PropertyGroup"/> to remove</param>
+        public void RemovePropertyGroup(string propertyGroupName)
+        {
+            PropertyGroups.RemoveItem(propertyGroupName);
+        }
+
        /// <summary>
        /// Sets the ParentId from the lazy integer id
        /// </summary>
@@ -485,5 +494,14 @@ namespace Umbraco.Core.Models
        {
            _parentId = id;
        }
+
+        /// <summary>
+        /// PropertyTypes that are not part of a PropertyGroup
+        /// </summary>
+        [IgnoreDataMember]
+        internal PropertyTypeCollection PropertyTypeCollection
+        {
+             get { return _propertyTypes; }
+        }
    }
 }
@@ -75,7 +75,7 @@ namespace Umbraco.Core.Models
            if (contentType.ContentTypeComposition.Any(x => x.CompositionAliases().Any(ContentTypeCompositionExists)))
                return false;

-            if (!ContentTypeCompositionExists(contentType.Alias))
+            if (ContentTypeCompositionExists(contentType.Alias) == false)
            {
                _contentTypeComposition.Add(contentType);
                OnPropertyChanged(ContentTypeCompositionSelector);
@@ -108,7 +108,7 @@ namespace Umbraco.Core.Models.EntityBase
        /// Please note that resetting the dirty properties could potentially
        /// obstruct the saving of a new or updated entity.
        /// </remarks>
-        internal void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        internal virtual void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
        {
            if (rememberPreviouslyChangedProperties)
            {
@@ -64,6 +64,12 @@ namespace Umbraco.Core.Models
        /// <param name="propertyTypeAlias">Alias of the <see cref="PropertyType"/> to remove</param>
        void RemovePropertyType(string propertyTypeAlias);

+        /// <summary>
+        /// Removes a PropertyGroup from the current ContentType
+        /// </summary>
+        /// <param name="propertyGroupName">Name of the <see cref="PropertyGroup"/> to remove</param>
+        void RemovePropertyGroup(string propertyGroupName);
+
        /// <summary>
        /// Sets the ParentId from the lazy integer id
        /// </summary>
@@ -1,6 +1,5 @@
 using System;
 using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;

 namespace Umbraco.Core.Models
 {
@@ -7,17 +7,25 @@ namespace Umbraco.Core.Models.Membership
    /// Defines the interface for a <see cref="User"/>
    /// </summary>
    /// <remarks>Will be left internal until a proper Membership implementation is part of the roadmap</remarks>
-    internal interface IUser : IMembershipUser
+    internal interface IUser : IMembershipUser, IUserProfile
    {
-        string Name { get; set; }
+        new object Id { get; set; }
+        //string Name { get; set; }
        int SessionTimeout { get; set; }
        int StartContentId { get; set; }
        int StartMediaId { get; set; }
        string Language { get; set; }
        bool DefaultToLiveEditing { get; set; }
-        IEnumerable<string> Applications { get; set; }
+
        bool NoConsole { get; set; }
        IUserType UserType { get; }
-        string Permissions { get; set; }
+        string DefaultPermissions { get; set; }
+    }
+
+    internal interface IUserProfile : IProfile
+    {
+        IEnumerable<string> AllowedSections { get; }
+        void RemoveAllowedSection(string sectionAlias);
+        void AddAllowedSection(string sectionAlias);
    }
 }
@@ -1,5 +1,7 @@
 using System;
+using System.Reflection;
 using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;

 namespace Umbraco.Core.Models.Membership
 {
@@ -8,7 +10,7 @@ namespace Umbraco.Core.Models.Membership
    /// </summary>
    [Serializable]
    [DataContract(IsReference = true)]
-    internal class Profile : IProfile
+    internal class Profile : TracksChangesEntityBase, IProfile, IRememberBeingDirty
    {
        /// <summary>
        /// Initializes a new instance of the <see cref="Profile"/> class.
@@ -25,11 +27,47 @@ namespace Umbraco.Core.Models.Membership
            Name = name;
        }

-        [DataMember]
-        public object Id { get; set; }
+        private object _id;
+        private string _name;
+        private Type _userTypeKey;
+
+        private static readonly PropertyInfo IdSelector = ExpressionHelper.GetPropertyInfo<Profile, object>(x => x.Id);
+        private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<Profile, string>(x => x.Name);
+        private static readonly PropertyInfo UserTypeKeySelector = ExpressionHelper.GetPropertyInfo<Profile, Type>(x => x.ProviderUserKeyType);

        [DataMember]
-        public string Name { get; set; }
+        public object Id
+        {
+            get
+            {
+                return _id;
+            }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _id = value;
+                    return _id;
+                }, _id, IdSelector);
+            }
+        }
+
+        [DataMember]
+        public string Name
+        {
+            get
+            {
+                return _name;
+            }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _name = value;
+                    return _name;
+                }, _name, NameSelector);
+            }
+        }

        [IgnoreDataMember]
        public virtual object ProviderUserKey
@@ -45,7 +83,21 @@ namespace Umbraco.Core.Models.Membership
        /// The type of the provider user key.
        /// </value>
        [IgnoreDataMember]
-        internal Type ProviderUserKeyType { get; private set; }
+        internal Type ProviderUserKeyType
+        {
+            get
+            {
+                return _userTypeKey;
+            }
+            private set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _userTypeKey = value;
+                    return _userTypeKey;
+                }, _userTypeKey, UserTypeKeySelector);
+            }
+        }

        /// <summary>
        /// Sets the type of the provider user key.
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Models.Membership

        public User(IUserType userType)
        {
-            Groups = new List<object> {userType};
+            Groups = new List<object> { userType };
        }

        #region Implementation of IEntity
@@ -91,7 +91,8 @@ namespace Umbraco.Core.Models.Membership
        [DataMember]
        public string Language { get; set; }
        [DataMember]
-        public string Permissions { get; set; }
+        public string DefaultPermissions { get; set; }
+
        [DataMember]
        public bool DefaultToLiveEditing { get; set; }
        [DataMember]
@@ -100,8 +101,8 @@ namespace Umbraco.Core.Models.Membership
        [IgnoreDataMember]
        public IUserType UserType
        {
-            get 
-            { 
+            get
+            {
                var type = Groups.FirstOrDefault();
                return type as IUserType;
            }
@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.Serialization;

 namespace Umbraco.Core.Models.Membership
@@ -14,14 +17,29 @@ namespace Umbraco.Core.Models.Membership
    /// </remarks>
    [Serializable]
    [DataContract(IsReference = true)]
-    internal class UserProfile : Profile
+    internal class UserProfile : Profile, IUserProfile
    {
        public UserProfile()
        {
            SessionTimeout = 60;
-            Applications = Enumerable.Empty<string>();
+            _sectionCollection = new ObservableCollection<string>();
+            _addedSections = new List<string>();
+            _removedSections = new List<string>();
+            _sectionCollection.CollectionChanged += SectionCollectionChanged;
        }

+        private readonly List<string> _addedSections;
+        private readonly List<string> _removedSections;
+        private readonly ObservableCollection<string> _sectionCollection;
+        private int _sessionTimeout;
+        private int _startContentId;
+        private int _startMediaId;
+
+        private static readonly PropertyInfo SessionTimeoutSelector = ExpressionHelper.GetPropertyInfo<UserProfile, int>(x => x.SessionTimeout);
+        private static readonly PropertyInfo StartContentIdSelector = ExpressionHelper.GetPropertyInfo<UserProfile, int>(x => x.StartContentId);
+        private static readonly PropertyInfo StartMediaIdSelector = ExpressionHelper.GetPropertyInfo<UserProfile, int>(x => x.StartMediaId);
+        private static readonly PropertyInfo AllowedSectionsSelector = ExpressionHelper.GetPropertyInfo<UserProfile, IEnumerable<string>>(x => x.AllowedSections);
+
        /// <summary>
        /// Gets or sets the session timeout.
        /// </summary>
@@ -29,7 +47,21 @@ namespace Umbraco.Core.Models.Membership
        /// The session timeout.
        /// </value>
        [DataMember]
-        public int SessionTimeout { get; set; }
+        public int SessionTimeout
+        {
+            get
+            {
+                return _sessionTimeout;
+            }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _sessionTimeout = value;
+                    return _sessionTimeout;
+                }, _sessionTimeout, SessionTimeoutSelector);
+            }
+        }

        /// <summary>
        /// Gets or sets the start content id.
@@ -38,7 +70,21 @@ namespace Umbraco.Core.Models.Membership
        /// The start content id.
        /// </value>
        [DataMember]
-        public int StartContentId { get; set; }
+        public int StartContentId
+        {
+            get
+            {
+                return _startContentId;
+            }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _startContentId = value;
+                    return _startContentId;
+                }, _startContentId, StartContentIdSelector);
+            }
+        }

        /// <summary>
        /// Gets or sets the start media id.
@@ -47,15 +93,96 @@ namespace Umbraco.Core.Models.Membership
        /// The start media id.
        /// </value>
        [DataMember]
-        public int StartMediaId { get; set; }
+        public int StartMediaId
+        {
+            get
+            {
+                return _startMediaId;
+            }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _startMediaId = value;
+                    return _startMediaId;
+                }, _startMediaId, StartMediaIdSelector);
+            }
+        }
+
+        public IEnumerable<string> AllowedSections
+        {
+            get { return _sectionCollection; }
+        }
+
+        public void RemoveAllowedSection(string sectionAlias)
+        {
+            _sectionCollection.Remove(sectionAlias);
+        }
+
+        public void AddAllowedSection(string sectionAlias)
+        {
+            if (!_sectionCollection.Contains(sectionAlias))
+            {
+                _sectionCollection.Add(sectionAlias);
+            }
+        }

        /// <summary>
-        /// Gets or sets the applications.
+        /// Whenever resetting occurs, clear the remembered add/removed collections, even if 
+        /// rememberPreviouslyChangedProperties is true, the AllowedSections property will still
+        /// be flagged as dirty.
        /// </summary>
-        /// <value>
-        /// The applications.
-        /// </value>
-        [DataMember]
-        public IEnumerable<string> Applications { get; set; }
+        /// <param name="rememberPreviouslyChangedProperties"></param>
+        internal override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        {
+            _addedSections.Clear();
+            _removedSections.Clear();
+            base.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+        }
+
+        /// <summary>
+        /// Used internally to check if we need to add a section in the repository to the db
+        /// </summary>
+        internal IEnumerable<string> AddedSections
+        {
+            get { return _addedSections; }
+        }
+
+        /// <summary>
+        /// Used internally to check if we need to remove  a section in the repository to the db
+        /// </summary>
+        internal IEnumerable<string> RemovedSections
+        {
+            get { return _removedSections; }
+        }
+
+        /// <summary>
+        /// Handles the collection changed event in order for us to flag the AllowedSections property as changed
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void SectionCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            OnPropertyChanged(AllowedSectionsSelector);
+
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                //remove from the removed/added sections (since people could add/remove all they want in one request)
+                _removedSections.RemoveAll(s => s == e.NewItems.Cast<string>().First());
+                _addedSections.RemoveAll(s => s == e.NewItems.Cast<string>().First());
+
+                //add to the added sections
+                _addedSections.Add(e.NewItems.Cast<string>().First());
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                //remove from the removed/added sections (since people could add/remove all they want in one request)
+                _removedSections.RemoveAll(s => s == e.OldItems.Cast<string>().First());
+                _addedSections.RemoveAll(s => s == e.OldItems.Cast<string>().First());
+
+                //add to the added sections
+                _removedSections.Add(e.OldItems.Cast<string>().First());
+            }
+        }
    }
 }
@@ -1,7 +1,15 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
+using System.Xml.XPath;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Services;
+using umbraco.interfaces;

 namespace Umbraco.Core.Models
 {
@@ -14,10 +22,15 @@ namespace Umbraco.Core.Models
        /// <returns>Xml of the property and its value</returns>
        public static XElement ToXml(this Property property)
        {
-            string nodeName = UmbracoSettings.UseLegacyXmlSchema ? "data" : property.Alias.ToSafeAlias();
+            return property.ToXml(ApplicationContext.Current.Services.DataTypeService);
+        }
+
+        internal static XElement ToXml(this Property property, IDataTypeService dataTypeService)
+        {
+            var nodeName = UmbracoSettings.UseLegacyXmlSchema ? "data" : property.Alias.ToSafeAlias();

            var xd = new XmlDocument();
-            XmlNode xmlNode = xd.CreateNode(XmlNodeType.Element, nodeName, "");
+            var xmlNode = xd.CreateNode(XmlNodeType.Element, nodeName, "");

            //Add the property alias to the legacy schema
            if (UmbracoSettings.UseLegacyXmlSchema)
@@ -28,8 +41,21 @@ namespace Umbraco.Core.Models
            }

            //This seems to fail during testing 
-            xmlNode.AppendChild(property.PropertyType.DataType(property.Id).Data.ToXMl(xd));
-            
+            //SD: With the new null checks below, this shouldn't fail anymore.
+            var dt = property.PropertyType.DataType(property.Id, dataTypeService);
+            if (dt != null && dt.Data != null)
+            {
+                //We've already got the value for the property so we're going to give it to the 
+                // data type's data property so it doesn't go re-look up the value from the db again.
+                var defaultData = dt.Data as IDataValueSetter;
+                if (defaultData != null)
+                {
+                    defaultData.SetValue(property.Value, property.PropertyType.DataTypeDatabaseType.ToString());
+                }
+
+                xmlNode.AppendChild(dt.Data.ToXMl(xd));
+            }
+
            var element = xmlNode.GetXElement();
            return element;
        }
@@ -108,6 +108,23 @@ namespace Umbraco.Core.Models
            }
        }

+        internal PropertyGroup Clone()
+        {
+            var clone = (PropertyGroup) this.MemberwiseClone();
+            var collection = new PropertyTypeCollection();
+            foreach (var propertyType in this.PropertyTypes)
+            {
+                var property = propertyType.Clone();
+                property.ResetIdentity();
+                property.ResetDirtyProperties(false);
+                collection.Add(property);
+            }
+            clone.PropertyTypes = collection;
+            clone.ResetIdentity();
+            clone.ResetDirtyProperties(false);
+            return clone;
+        }
+
        /// <summary>
        /// Sets the ParentId from the lazy integer id
        /// </summary>
@@ -97,6 +97,14 @@ namespace Umbraco.Core.Models
            return this.Any(x => x.Name == groupName);
        }

+        public void RemoveItem(string propertyGroupName)
+        {
+            var key = IndexOfKey(propertyGroupName);
+            //Only removes an item if the key was found
+            if (key != -1)
+                RemoveItem(key);
+        }
+
        public int IndexOfKey(string key)
        {
            for (var i = 0; i < this.Count; i++)
@@ -378,6 +378,14 @@ namespace Umbraco.Core.Models
            return true;
        }

+        internal PropertyType Clone()
+        {
+            var clone = (PropertyType) this.MemberwiseClone();
+            clone.ResetIdentity();
+            clone.ResetDirtyProperties(false);
+            return clone;
+        }
+
        public bool Equals(PropertyType other)
        {
            //Check whether the compared object is null. 
@@ -1,4 +1,5 @@
-using umbraco.interfaces;
+using Umbraco.Core.Services;
+using umbraco.interfaces;

 namespace Umbraco.Core.Models
 {
@@ -9,6 +10,7 @@ namespace Umbraco.Core.Models
        /// </summary>
        /// <param name="propertyType">PropertyType that references a DataType</param>
        /// <param name="propertyId">Id of the Property which references this DataType through its PropertyType</param>
+        /// <param name="dataTypeService"></param>
        /// <returns><see cref="IDataType"/></returns>
        /// <remarks>
        /// This extension method is left internal because we don't want to take
@@ -16,10 +18,14 @@ namespace Umbraco.Core.Models
        /// be replaced by PropertyEditors. It is however needed to generate xml
        /// for a property/propertytype when publishing.
        /// </remarks>
-        internal static IDataType DataType(this PropertyType propertyType, int propertyId)
+        internal static IDataType DataType(this PropertyType propertyType, int propertyId, IDataTypeService dataTypeService)
        {
            Mandate.ParameterNotNull(propertyType, "propertyType");
-            var dataType = ApplicationContext.Current.Services.DataTypeService.GetDataTypeById(propertyType.DataTypeId);
+            var dataType = dataTypeService.GetDataTypeById(propertyType.DataTypeId);
+            if (dataType == null)
+            {
+                return null;
+            }
            dataType.DataTypeDefinitionId = propertyType.DataTypeDefinitionId;
            dataType.Data.PropertyId = propertyId;
            return dataType;
@@ -65,12 +65,12 @@ namespace Umbraco.Core.Models.Rdbms
                    return Date.Value;
                }
                
-                if(!string.IsNullOrEmpty(VarChar))
+                if(string.IsNullOrEmpty(VarChar) == false)
                {
                    return VarChar;
                }

-                if(!string.IsNullOrEmpty(Text))
+                if(string.IsNullOrEmpty(Text) == false)
                {
                    return Text;
                }
@@ -1,4 +1,5 @@
-using Umbraco.Core.Persistence;
+using System.Collections.Generic;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseAnnotations;

 namespace Umbraco.Core.Models.Rdbms
@@ -59,5 +60,8 @@ namespace Umbraco.Core.Models.Rdbms
        [Column("defaultToLiveEditing")]
        [Constraint(Default = "0")]
        public bool DefaultToLiveEditing { get; set; }
+
+        [ResultColumn]
+        public List<User2AppDto> User2AppDtos { get; set; }
    }
 }
@@ -20,7 +20,6 @@ namespace Umbraco.Core.Models
        private int _level;
        private int _sortOrder;
        private int _parentId;
-        private string _nodePath;
        private int _masterTemplateId;
        private string _masterTemplateAlias;

@@ -28,7 +27,6 @@ namespace Umbraco.Core.Models
        private static readonly PropertyInfo LevelSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.Level);
        private static readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.SortOrder);
        private static readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.ParentId);
-        private static readonly PropertyInfo NodePathSelector = ExpressionHelper.GetPropertyInfo<Template, string>(x => x.NodePath);
        //private static readonly PropertyInfo MasterTemplateIdSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.MasterTemplateId);
        private static readonly PropertyInfo MasterTemplateAliasSelector = ExpressionHelper.GetPropertyInfo<Template, string>(x => x.MasterTemplateAlias);
        
@@ -104,21 +102,7 @@ namespace Umbraco.Core.Models
                }, _parentId, ParentIdSelector);    
            }
        }
-
-        [DataMember]
-        internal string NodePath
-        {
-            get { return _nodePath; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _nodePath = value;
-                    return _nodePath;
-                }, _nodePath, NodePathSelector);    
-            }
-        }
-
+        
        [DataMember]
        internal Lazy<int> MasterTemplateId { get; set; }

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using Umbraco.Core.CodeAnnotations;

@@ -9,7 +10,8 @@ namespace Umbraco.Core.Models
    /// </summary>
    public static class UmbracoObjectTypesExtensions
    {
-        private static readonly Dictionary<UmbracoObjectTypes, Guid> UmbracoObjectTypeCache = new Dictionary<UmbracoObjectTypes,Guid>();
+        //MUST be concurrent to avoid thread collisions!
+        private static readonly ConcurrentDictionary<UmbracoObjectTypes, Guid> UmbracoObjectTypeCache = new ConcurrentDictionary<UmbracoObjectTypes, Guid>();

        /// <summary>
        /// Get an UmbracoObjectTypes value from it's name
@@ -48,24 +50,22 @@ namespace Umbraco.Core.Models
        /// <returns>a GUID value of the UmbracoObjectTypes</returns>
        public static Guid GetGuid(this UmbracoObjectTypes umbracoObjectType)
        {
-            if (UmbracoObjectTypeCache.ContainsKey(umbracoObjectType))
-                return UmbracoObjectTypeCache[umbracoObjectType];
+            return UmbracoObjectTypeCache.GetOrAdd(umbracoObjectType, types =>
+                {
+                    var type = typeof(UmbracoObjectTypes);
+                    var memInfo = type.GetMember(umbracoObjectType.ToString());
+                    var attributes = memInfo[0].GetCustomAttributes(typeof(UmbracoObjectTypeAttribute),
+                        false);

-            var type = typeof(UmbracoObjectTypes);
-            var memInfo = type.GetMember(umbracoObjectType.ToString());
-            var attributes = memInfo[0].GetCustomAttributes(typeof(UmbracoObjectTypeAttribute),
-                false);
+                    if (attributes.Length == 0)
+                        return Guid.Empty;

-            if (attributes.Length == 0)
-                return Guid.Empty;
+                    var attribute = ((UmbracoObjectTypeAttribute)attributes[0]);
+                    if (attribute == null)
+                        return Guid.Empty;

-            var attribute = ((UmbracoObjectTypeAttribute)attributes[0]);
-            if (attribute == null)
-                return Guid.Empty;
-
-            UmbracoObjectTypeCache.Add(umbracoObjectType, attribute.ObjectId);
-
-            return attribute.ObjectId;
+                    return attribute.ObjectId;
+                });
        }

        /// <summary>
@@ -0,0 +1,50 @@
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Currently just used to get the machine name in med trust and to format a machine name for use with file names
+    /// </summary>
+    internal class NetworkHelper
+    {
+        /// <summary>
+        /// Returns the machine name that is safe to use in file paths.
+        /// </summary>
+        /// <remarks>
+        /// see: https://github.com/Shandem/ClientDependency/issues/4
+        /// </remarks>
+        public static string FileSafeMachineName
+        {
+            get { return MachineName.ReplaceNonAlphanumericChars('-'); }
+        }
+
+        /// <summary>
+        /// Returns the current machine name
+        /// </summary>
+        /// <remarks>
+        /// Tries to resolve the machine name, if it cannot it uses the config section.
+        /// </remarks>
+        public static string MachineName
+        {
+            get
+            {
+                try
+                {
+                    return Environment.MachineName;
+                }
+                catch
+                {
+                    try
+                    {
+                        return System.Net.Dns.GetHostName();
+                    }
+                    catch
+                    {
+                        //if we get here it means we cannot access the machine name
+                        throw new ApplicationException("Cannot resolve the current machine name eithe by Environment.MachineName or by Dns.GetHostname()");
+                    }
+                }
+            }
+        }
+    }
+}
@@ -1,9 +1,11 @@
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Caching;
 using System.Threading;
+using System.Web;
 using Umbraco.Core.Models.EntityBase;

 namespace Umbraco.Core.Persistence.Caching
@@ -11,6 +13,23 @@ namespace Umbraco.Core.Persistence.Caching
    /// <summary>
    /// The Runtime Cache provider looks up objects in the Runtime cache for fast retrival
    /// </summary>
+    /// <remarks>
+    /// 
+    /// If a web session is detected then the HttpRuntime.Cache will be used for the runtime cache, otherwise a custom
+    /// MemoryCache instance will be used. It is important to use the HttpRuntime.Cache when a web session is detected so 
+    /// that the memory management of cache in IIS can be handled appopriately.
+    /// 
+    /// When a web sessions is detected we will pre-fix all HttpRuntime.Cache entries so that when we clear it we are only 
+    /// clearing items that have been inserted by this provider.
+    /// 
+    /// NOTE: These changes are all temporary until we finalize the ApplicationCache implementation which will support static cache, runtime cache
+    /// and request based cache which will all live in one central location so it is easily managed. 
+    /// 
+    /// Also note that we don't always keep checking if HttpContext.Current == null and instead check for _memoryCache != null. This is because
+    /// when there are async requests being made even in the context of a web request, the HttpContext.Current will be null but the HttpRuntime.Cache will
+    /// always be available.
+    /// 
+    /// </remarks>
    internal sealed class RuntimeCacheProvider : IRepositoryCacheProvider
    {
        #region Singleton
@@ -21,19 +40,25 @@ namespace Umbraco.Core.Persistence.Caching

        private RuntimeCacheProvider()
        {
+            if (HttpContext.Current == null)
+            {
+                _memoryCache = new MemoryCache("in-memory");
+            }
        }

        #endregion

        //TODO Save this in cache as well, so its not limited to a single server usage
        private readonly ConcurrentHashSet<string> _keyTracker = new ConcurrentHashSet<string>();
-        private ObjectCache _memoryCache = new MemoryCache("in-memory");
+        private ObjectCache _memoryCache;
        private static readonly ReaderWriterLockSlim ClearLock = new ReaderWriterLockSlim();

        public IEntity GetById(Type type, Guid id)
        {
            var key = GetCompositeId(type, id);
-            var item = _memoryCache.Get(key);
+            var item = _memoryCache != null 
+                ? _memoryCache.Get(key) 
+                : HttpRuntime.Cache.Get(key);
            return item as IEntity;
        }

@@ -41,7 +66,11 @@ namespace Umbraco.Core.Persistence.Caching
        {
            foreach (var guid in ids)
            {
-                yield return _memoryCache.Get(GetCompositeId(type, guid)) as IEntity;
+                var item = _memoryCache != null
+                               ? _memoryCache.Get(GetCompositeId(type, guid))
+                               : HttpRuntime.Cache.Get(GetCompositeId(type, guid));
+
+                yield return item as IEntity;
            }
        }

@@ -49,9 +78,13 @@ namespace Umbraco.Core.Persistence.Caching
        {
            foreach (var key in _keyTracker)
            {
-                if (key.StartsWith(type.Name))
+                if (key.StartsWith(string.Format("{0}{1}-", CacheItemPrefix, type.Name)))
                {
-                    yield return _memoryCache.Get(key) as IEntity;
+                    var item = _memoryCache != null
+                               ? _memoryCache.Get(key)
+                               : HttpRuntime.Cache.Get(key);
+
+                    yield return item as IEntity;
                }
            }
        }
@@ -59,21 +92,34 @@ namespace Umbraco.Core.Persistence.Caching
        public void Save(Type type, IEntity entity)
        {
            var key = GetCompositeId(type, entity.Id);
-            var exists = _memoryCache.GetCacheItem(key) != null;
+            
            _keyTracker.TryAdd(key);
-            if (exists)
+
+            //NOTE: Before we were checking if it already exists but the MemoryCache.Set handles this implicitly and does 
+            // an add or update, same goes for HttpRuntime.Cache.Insert.
+
+            if (_memoryCache != null)
            {
                _memoryCache.Set(key, entity, new CacheItemPolicy { SlidingExpiration = TimeSpan.FromMinutes(5) });
-                return;
            }
-
-            _memoryCache.Add(key, entity, new CacheItemPolicy { SlidingExpiration = TimeSpan.FromMinutes(5) });
+            else
+            {
+                HttpRuntime.Cache.Insert(key, entity, null, System.Web.Caching.Cache.NoAbsoluteExpiration, TimeSpan.FromMinutes(5));
+            }
        }

        public void Delete(Type type, IEntity entity)
        {
            var key = GetCompositeId(type, entity.Id);
-            _memoryCache.Remove(key);
+            if (_memoryCache != null)
+            {
+                _memoryCache.Remove(key);
+            }
+            else
+            {
+                HttpRuntime.Cache.Remove(key);
+            }
+            
            _keyTracker.Remove(key);
        }

@@ -88,14 +134,21 @@ namespace Umbraco.Core.Persistence.Caching
                var keys = new string[_keyTracker.Count];
                _keyTracker.CopyTo(keys, 0);
                var keysToRemove = new List<string>();
-                foreach (var key in keys.Where(x => x.StartsWith(string.Format("{0}-", type.Name))))
+                foreach (var key in keys.Where(x => x.StartsWith(string.Format("{0}{1}-", CacheItemPrefix, type.Name))))
                {
                    _keyTracker.Remove(key);
                    keysToRemove.Add(key);
                }
                foreach (var key in keysToRemove)
                {
-                    _memoryCache.Remove(key);
+                    if (_memoryCache != null)
+                    {
+                        _memoryCache.Remove(key);
+                    }
+                    else
+                    {
+                        HttpRuntime.Cache.Remove(key);
+                    }
                }
            }
        }
@@ -105,19 +158,40 @@ namespace Umbraco.Core.Persistence.Caching
            using (new WriteLock(ClearLock))
            {
                _keyTracker.Clear();
-                _memoryCache.DisposeIfDisposable();
-                _memoryCache = new MemoryCache("in-memory");
+
+                if (_memoryCache != null)
+                {
+                    _memoryCache.DisposeIfDisposable();
+                    _memoryCache = new MemoryCache("in-memory");
+                }
+                else
+                {
+                    foreach (DictionaryEntry c in HttpRuntime.Cache)
+                    {
+                        if (c.Key is string && ((string)c.Key).InvariantStartsWith(CacheItemPrefix))
+                        {
+                            if (HttpRuntime.Cache[(string)c.Key] == null) return;
+                            HttpRuntime.Cache.Remove((string)c.Key);
+                        }
+                    }   
+                }
            }
        }

+        /// <summary>
+        /// We prefix all cache keys with this so that we know which ones this class has created when 
+        /// using the HttpRuntime cache so that when we clear it we don't clear other entries we didn't create.
+        /// </summary>
+        private const string CacheItemPrefix = "umbrtmche_";
+
        private string GetCompositeId(Type type, Guid id)
        {
-            return string.Format("{0}-{1}", type.Name, id.ToString());
+            return string.Format("{0}{1}-{2}", CacheItemPrefix, type.Name, id.ToString());
        }

        private string GetCompositeId(Type type, int id)
        {
-            return string.Format("{0}-{1}", type.Name, id.ToGuid());
+            return string.Format("{0}{1}-{2}", CacheItemPrefix, type.Name, id.ToGuid());
        }
    }
 }
@@ -3,6 +3,7 @@ using System.Data;
 using System.Linq;
 using System.Reflection;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
+using Umbraco.Core.Persistence.SqlSyntax;

 namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
@@ -107,6 +108,12 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
            var constraintAttribute = propertyInfo.FirstAttribute<ConstraintAttribute>();
            if (constraintAttribute != null)
            {
+                //Special case for MySQL as it can't have multiple default DateTime values, which 
+                //is what the umbracoServer table definition is trying to create
+                if (SqlSyntaxContext.SqlSyntaxProvider is MySqlSyntaxProvider && definition.TableName == "umbracoServer" &&
+                        definition.TableName.ToLowerInvariant() == "lastNotifiedDate".ToLowerInvariant())
+                    return definition;
+
                definition.ConstraintName = constraintAttribute.Name ?? string.Empty;
                definition.DefaultValue = constraintAttribute.Default ?? string.Empty;
            }
@@ -14,9 +14,9 @@ namespace Umbraco.Core.Persistence
 	/// </remarks>
 	internal class DefaultDatabaseFactory : DisposableObject, IDatabaseFactory
 	{
-		private readonly string _connectionStringName;
-        private readonly string _connectionString;
-		private readonly string _providerName;
+	    private readonly string _connectionStringName;
+        public string ConnectionString { get; private set; }
+        public string ProviderName { get; private set; }
        
        //very important to have ThreadStatic:
        // see: http://issues.umbraco.org/issue/U4-2172
@@ -52,8 +52,8 @@ namespace Umbraco.Core.Persistence
 		{
 			Mandate.ParameterNotNullOrEmpty(connectionString, "connectionString");
 			Mandate.ParameterNotNullOrEmpty(providerName, "providerName");
-			_connectionString = connectionString;
-			_providerName = providerName;
+			ConnectionString = connectionString;
+			ProviderName = providerName;
 		}

 		public UmbracoDatabase CreateDatabase()
@@ -68,8 +68,8 @@ namespace Umbraco.Core.Persistence
 						//double check
                        if (_nonHttpInstance == null)
 						{
-                            _nonHttpInstance = string.IsNullOrEmpty(_connectionString) == false && string.IsNullOrEmpty(_providerName) == false
-						                          ? new UmbracoDatabase(_connectionString, _providerName)
+                            _nonHttpInstance = string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
+						                          ? new UmbracoDatabase(ConnectionString, ProviderName)
 						                          : new UmbracoDatabase(_connectionStringName);
 						}
 					}
@@ -81,8 +81,8 @@ namespace Umbraco.Core.Persistence
 			if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)) == false)
 			{
 			    HttpContext.Current.Items.Add(typeof (DefaultDatabaseFactory),
-			                                  string.IsNullOrEmpty(_connectionString) == false && string.IsNullOrEmpty(_providerName) == false
-			                                      ? new UmbracoDatabase(_connectionString, _providerName)
+			                                  string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
+			                                      ? new UmbracoDatabase(ConnectionString, ProviderName)
 			                                      : new UmbracoDatabase(_connectionStringName));
 			}
 			return (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
@@ -67,17 +67,18 @@ namespace Umbraco.Core.Persistence.Factories
                if (property.HasIdentity)
                    dto.Id = property.Id;

-                if (property.DataTypeDatabaseType == DataTypeDatabaseType.Integer && property.Value != null && string.IsNullOrWhiteSpace(property.Value.ToString()) == false)
+                if (property.DataTypeDatabaseType == DataTypeDatabaseType.Integer)
                {
-                    if (property.Value is bool)
+                    if (property.Value is bool || property.PropertyType.DataTypeId == new Guid("38b352c1-e9f8-4fd8-9324-9a2eab06d97a"))
                    {
-                        int val = Convert.ToInt32(property.Value);
-                        dto.Integer = val;
+                        dto.Integer = property.Value != null && string.IsNullOrEmpty(property.Value.ToString())
+                                          ? 0
+                                          : Convert.ToInt32(property.Value);
                    }
                    else
                    {
                        int val;
-                        if (int.TryParse(property.Value.ToString(), out val))
+                        if ((property.Value != null && string.IsNullOrWhiteSpace(property.Value.ToString()) == false) && int.TryParse(property.Value.ToString(), out val))
                        {
                            dto.Integer = val;
                        }
@@ -37,7 +37,7 @@ namespace Umbraco.Core.Persistence.Factories
                                   Level = dto.NodeDto.Level,
                                   ParentId = dto.NodeDto.ParentId,
                                   SortOrder = dto.NodeDto.SortOrder,
-                                   NodePath = dto.NodeDto.Path
+                                   Path = dto.NodeDto.Path
                               };
            
            if(dto.Master.HasValue)
@@ -83,7 +83,7 @@ namespace Umbraco.Core.Persistence.Factories
                                  Level = short.Parse(entity.Level.ToString(CultureInfo.InvariantCulture)),
                                  NodeObjectType = _nodeObjectTypeId,
                                  ParentId = entity.ParentId,
-                                  Path = entity.NodePath,
+                                  Path = entity.Path,
                                  SortOrder = entity.SortOrder,
                                  Text = entity.Name,
                                  Trashed = false,
@@ -1,4 +1,5 @@
-using Umbraco.Core.Models.Membership;
+using System.Collections.Generic;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;

 namespace Umbraco.Core.Persistence.Factories
@@ -16,8 +17,7 @@ namespace Umbraco.Core.Persistence.Factories

        public IUser BuildEntity(UserDto dto)
        {
-            //TODO Add list of applications for user
-            return new User(_userType)
+            var user = new User(_userType)
                       {
                           Id = dto.Id,
                           ProfileId = dto.Id,
@@ -32,8 +32,19 @@ namespace Umbraco.Core.Persistence.Factories
                           Language = dto.UserLanguage,
                           DefaultToLiveEditing = dto.DefaultToLiveEditing,
                           NoConsole = dto.NoConsole,
-                           Permissions = dto.DefaultPermissions
+                           DefaultPermissions = dto.DefaultPermissions
                       };
+
+            foreach (var app in dto.User2AppDtos)
+            {
+                user.AddAllowedSection(app.AppAlias);
+            }
+
+            //on initial construction we don't want to have dirty properties tracked
+            // http://issues.umbraco.org/issue/U4-1946
+            user.ResetDirtyProperties(false);
+
+            return user;
        }

        public UserDto BuildDto(IUser entity)
@@ -51,9 +62,24 @@ namespace Umbraco.Core.Persistence.Factories
                              UserLanguage = entity.Language,
                              UserName = entity.Name,
                              Type = short.Parse(entity.UserType.Id.ToString()),
-                              DefaultPermissions = entity.Permissions
+                              DefaultPermissions = entity.DefaultPermissions,
+                              User2AppDtos = new List<User2AppDto>()
                          };

+            foreach (var app in entity.AllowedSections)
+            {
+                var appDto = new User2AppDto
+                    {
+                        AppAlias = app
+                    };
+                if (entity.Id != null)
+                {
+                    appDto.UserId = (int) entity.Id;
+                }
+
+                dto.User2AppDtos.Add(appDto);
+            }
+
            if (entity.HasIdentity)
                dto.Id = entity.Id.SafeCast<int>();

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Linq.Expressions;
 using System.Reflection;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -7,11 +8,24 @@ namespace Umbraco.Core.Persistence.Mappers
 {
    public abstract class BaseMapper
    {
+        
+        internal abstract ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache { get; }
+
        internal abstract void BuildMap();

-        internal abstract string Map(string propertyName);
+        internal string Map(string propertyName)
+        {
+            DtoMapModel dtoTypeProperty;
+            return PropertyInfoCache.TryGetValue(propertyName, out dtoTypeProperty)
+                ? GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo)
+                : string.Empty;
+        }

-        internal abstract void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember);
+        internal void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
+        {
+            var property = ResolveMapping(sourceMember, destinationMember);
+            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
+        }

        internal DtoMapModel ResolveMapping<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
        {
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IContent))]
    public sealed class ContentMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            if(PropertyInfoCache.IsEmpty)
@@ -52,23 +57,7 @@ namespace Umbraco.Core.Persistence.Mappers
                //CacheMap<Content, DocumentDto>(src => src.Template, dto => dto.TemplateId);
            }
        }
-
-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
+        
        #endregion
    }
 }
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IContentType))]
    public sealed class ContentTypeMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            if (PropertyInfoCache.IsEmpty)
@@ -48,22 +53,6 @@ namespace Umbraco.Core.Persistence.Mappers
            }
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IDataTypeDefinition))]
    public sealed class DataTypeDefinitionMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<DataTypeDefinition, NodeDto>(src => src.Id, dto => dto.NodeId);
@@ -42,22 +47,6 @@ namespace Umbraco.Core.Persistence.Mappers

        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IDictionaryItem))]
    public sealed class DictionaryMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<DictionaryItem, DictionaryDto>(src => src.Id, dto => dto.PrimaryKey);
@@ -32,23 +37,7 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<DictionaryItem, DictionaryDto>(src => src.ItemKey, dto => dto.Key);
            CacheMap<DictionaryItem, DictionaryDto>(src => src.ParentId, dto => dto.Parent);
        }
-
-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
+        
        #endregion
    }
 }
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IDictionaryTranslation))]
    public class DictionaryTranslationMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<DictionaryTranslation, LanguageTextDto>(src => src.Id, dto => dto.PrimaryKey);
@@ -33,22 +38,6 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<DictionaryTranslation, LanguageTextDto>(src => src.Value, dto => dto.Value);
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(Language))]
    public sealed class LanguageMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<Language, LanguageDto>(src => src.Id, dto => dto.Id);
@@ -32,22 +37,6 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<Language, LanguageDto>(src => src.CultureName, dto => dto.CultureName);
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(Umbraco.Core.Models.Media))]
    public sealed class MediaMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            if (PropertyInfoCache.IsEmpty)
@@ -45,22 +50,6 @@ namespace Umbraco.Core.Persistence.Mappers
            }
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(MediaType))]
    public sealed class MediaTypeMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            if (PropertyInfoCache.IsEmpty)
@@ -48,22 +53,6 @@ namespace Umbraco.Core.Persistence.Mappers
            }
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion 
    }
 }
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(PropertyGroup))]
    public sealed class PropertyGroupMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -24,6 +24,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<PropertyGroup, PropertyTypeGroupDto>(src => src.Id, dto => dto.Id);
@@ -32,22 +37,6 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<PropertyGroup, PropertyTypeGroupDto>(src => src.Name, dto => dto.Text);
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(Property))]
    public sealed class PropertyMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -20,6 +20,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<Property, PropertyDataDto>(src => src.Id, dto => dto.Id);
@@ -27,22 +32,6 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<Property, PropertyDataDto>(src => src.PropertyTypeId, dto => dto.PropertyTypeId);
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(PropertyType))]
    public sealed class PropertyTypeMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -24,6 +24,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            if(PropertyInfoCache.IsEmpty)
@@ -42,22 +47,6 @@ namespace Umbraco.Core.Persistence.Mappers
            }
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(Relation))]
    public sealed class RelationMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -24,6 +24,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<Relation, RelationDto>(src => src.Id, dto => dto.Id);
@@ -33,23 +38,7 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<Relation, RelationDto>(src => src.ParentId, dto => dto.ParentId);
            CacheMap<Relation, RelationDto>(src => src.RelationTypeId, dto => dto.RelationType);
        }
-
-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
+        
        #endregion
    }
 }
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(RelationType))]
    public sealed class RelationTypeMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -24,6 +24,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<RelationType, RelationTypeDto>(src => src.Id, dto => dto.Id);
@@ -33,23 +38,7 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<RelationType, RelationTypeDto>(src => src.Name, dto => dto.Name);
            CacheMap<RelationType, RelationTypeDto>(src => src.ParentObjectType, dto => dto.ParentObjectType);
        }
-
-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
+        
        #endregion
    }
 }
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(ServerRegistration))]
    public sealed class ServerRegistrationMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -20,6 +20,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<ServerRegistration, ServerRegistrationDto>(src => src.Id, dto => dto.Id);
@@ -30,22 +35,6 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<ServerRegistration, ServerRegistrationDto>(src => src.ComputerName, dto => dto.ComputerName);
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -9,8 +9,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof (IUmbracoEntity))]
    public sealed class UmbracoEntityMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache =
-            new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -21,6 +20,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<IUmbracoEntity, NodeDto>(src => src.Id, dto => dto.NodeId);
@@ -34,24 +38,7 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<IUmbracoEntity, NodeDto>(src => src.Key, dto => dto.UniqueId);
            CacheMap<IUmbracoEntity, NodeDto>(src => src.CreatorId, dto => dto.UserId);
        }
-
-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember,
-                                                               Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
+        
        #endregion
    }
 }
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(User))]
    public sealed class UserMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -21,6 +21,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<User, UserDto>(src => src.Id, dto => dto.Id);
@@ -28,7 +33,7 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<User, UserDto>(src => src.Username, dto => dto.Login);
            CacheMap<User, UserDto>(src => src.Password, dto => dto.Password);
            CacheMap<User, UserDto>(src => src.Name, dto => dto.UserName);
-            CacheMap<User, UserDto>(src => src.Permissions, dto => dto.DefaultPermissions);
+            CacheMap<User, UserDto>(src => src.DefaultPermissions, dto => dto.DefaultPermissions);
            CacheMap<User, UserDto>(src => src.StartMediaId, dto => dto.MediaStartId);
            CacheMap<User, UserDto>(src => src.StartContentId, dto => dto.ContentStartId);
            CacheMap<User, UserDto>(src => src.DefaultToLiveEditing, dto => dto.DefaultToLiveEditing);
@@ -38,22 +43,6 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<User, UserDto>(src => src.Language, dto => dto.UserLanguage);
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
        #endregion
    }
 }
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(UserType))]
    public sealed class UserTypeMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache = new ConcurrentDictionary<string, DtoMapModel>();
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();

        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
        // otherwise that would fail because there is no public constructor.
@@ -25,6 +25,11 @@ namespace Umbraco.Core.Persistence.Mappers

        #region Overrides of BaseMapper

+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
        internal override void BuildMap()
        {
            CacheMap<UserType, UserTypeDto>(src => src.Id, dto => dto.Id);
@@ -33,21 +38,6 @@ namespace Umbraco.Core.Persistence.Mappers
            CacheMap<UserType, UserTypeDto>(src => src.Permissions, dto => dto.DefaultPermissions);
        }

-        internal override string Map(string propertyName)
-        {
-            if (!PropertyInfoCache.ContainsKey(propertyName))
-                return string.Empty;
-
-            var dtoTypeProperty = PropertyInfoCache[propertyName];
-
-            return base.GetColumnName(dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-        }
-
-        internal override void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = base.ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }

        #endregion
    }
@@ -223,8 +223,6 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 4, DataTypeId = -88, ControlId = new Guid(Constants.PropertyEditors.Textbox), DbType = "Nvarchar" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 5, DataTypeId = -89, ControlId = new Guid(Constants.PropertyEditors.TextboxMultiple), DbType = "Ntext" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 6, DataTypeId = -90, ControlId = new Guid(Constants.PropertyEditors.UploadField), DbType = "Nvarchar" });
-            //Dropdown list
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 12, DataTypeId = -91, ControlId = new Guid("a74ea9c9-8e18-4d2a-8cf6-73c6206c5da6"), DbType = "Nvarchar" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 7, DataTypeId = -92, ControlId = new Guid(Constants.PropertyEditors.NoEdit), DbType = "Nvarchar" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 8, DataTypeId = -36, ControlId = new Guid(Constants.PropertyEditors.DateTime), DbType = "Date" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 9, DataTypeId = -37, ControlId = new Guid(Constants.PropertyEditors.ColorPicker), DbType = "Nvarchar" });
@@ -234,24 +232,6 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 13, DataTypeId = -41, ControlId = new Guid(Constants.PropertyEditors.Date), DbType = "Date" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 14, DataTypeId = -42, ControlId = new Guid(Constants.PropertyEditors.DropDownList), DbType = "Integer" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 15, DataTypeId = -43, ControlId = new Guid(Constants.PropertyEditors.CheckBoxList), DbType = "Nvarchar" });
-            // Fix for rich text editor backwards compatibility -> 83722133-f80c-4273-bdb6-1befaa04a612 TinyMCE DataType
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 22, DataTypeId = -44, ControlId = new Guid("a3776494-0574-4d93-b7de-efdfdec6f2d1"), DbType = "Ntext" });
-            //Radiobutton list
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 23, DataTypeId = -128, ControlId = new Guid("a52c7c1c-c330-476e-8605-d63d3b84b6a6"), DbType = "Nvarchar" });
-            //Dropdown list multiple
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 24, DataTypeId = -129, ControlId = new Guid("928639ed-9c73-4028-920c-1e55dbb68783"), DbType = "Nvarchar" });
-            //Dropdown list
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 25, DataTypeId = -130, ControlId = new Guid("a74ea9c9-8e18-4d2a-8cf6-73c6206c5da6"), DbType = "Nvarchar" });
-            //Dropdown list
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 26, DataTypeId = -131, ControlId = new Guid("a74ea9c9-8e18-4d2a-8cf6-73c6206c5da6"), DbType = "Nvarchar" });
-            //Dropdown list
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 27, DataTypeId = -132, ControlId = new Guid("a74ea9c9-8e18-4d2a-8cf6-73c6206c5da6"), DbType = "Nvarchar" });
-            //No edit
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 28, DataTypeId = -133, ControlId = new Guid("6c738306-4c17-4d88-b9bd-6546f3771597"), DbType = "Ntext" });
-            //Dropdown list multiple
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 29, DataTypeId = -134, ControlId = new Guid("928639ed-9c73-4028-920c-1e55dbb68783"), DbType = "Nvarchar" });
-            //Not found - maybe a legacy thing?
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 30, DataTypeId = -50, ControlId = new Guid("aaf99bb2-dbbe-444d-a296-185076bf0484"), DbType = "Date" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 16, DataTypeId = 1034, ControlId = new Guid(Constants.PropertyEditors.ContentPicker), DbType = "Integer" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 17, DataTypeId = 1035, ControlId = new Guid(Constants.PropertyEditors.MediaPicker), DbType = "Integer" });
            _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 18, DataTypeId = 1036, ControlId = new Guid(Constants.PropertyEditors.MemberPicker), DbType = "Integer" });
@@ -384,7 +384,7 @@ namespace Umbraco.Core.Persistence
 		}

 		// Add a parameter to a DB command
-		void AddParam(IDbCommand cmd, object item, string ParameterPrefix)
+		internal void AddParam(IDbCommand cmd, object item, string ParameterPrefix)
 		{
 			// Convert value to from poco type to db type
 			if (Database.Mapper != null && item!=null)
@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Initial;
+using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;

 namespace Umbraco.Core.Persistence
@@ -28,6 +31,149 @@ namespace Umbraco.Core.Persistence
            CreateTable(db, overwrite, tableType);
        }

+        public static void BulkInsertRecords<T>(this Database db, IEnumerable<T> collection)
+        {
+            //don't do anything if there are no records.
+            if (collection.Any() == false)
+                return;
+
+            using (var tr = db.GetTransaction())
+            {
+                db.BulkInsertRecords(collection, tr);
+            }
+        }
+
+        public static void BulkInsertRecords<T>(this Database db, IEnumerable<T> collection, Transaction tr)
+        {
+            //don't do anything if there are no records.
+            if (collection.Any() == false)
+                return;
+
+            try
+            {
+                //if it is sql ce or it is a sql server version less than 2008, we need to do individual inserts.
+                var sqlServerSyntax = SqlSyntaxContext.SqlSyntaxProvider as SqlServerSyntaxProvider;
+                if ((sqlServerSyntax != null && (int)sqlServerSyntax.VersionName.Value < (int)SqlServerVersionName.V2008) 
+                    || SqlSyntaxContext.SqlSyntaxProvider is SqlCeSyntaxProvider)
+                {
+                    //SqlCe doesn't support bulk insert statements!
+
+                    foreach (var poco in collection)
+                    {
+                        db.Insert(poco);
+                    }
+                }
+                else
+                {
+                    string[] sqlStatements;
+                    var cmds = db.GenerateBulkInsertCommand(collection, db.Connection, out sqlStatements);
+                    for (var i = 0; i < sqlStatements.Length; i++)
+                    {
+                        using (var cmd = cmds[i])
+                        {
+                            cmd.CommandText = sqlStatements[i];
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+                }
+
+                tr.Complete();
+            }
+            catch
+            {
+                tr.Dispose();
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Creates a bulk insert command
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="db"></param>
+        /// <param name="collection"></param>
+        /// <param name="connection"></param>        
+        /// <param name="sql"></param>
+        /// <returns>Sql commands with populated command parameters required to execute the sql statement</returns>
+        /// <remarks>
+        /// The limits for number of parameters are 2100 (in sql server, I think there's many more allowed in mysql). So 
+        /// we need to detect that many params and split somehow. 
+        /// For some reason the 2100 limit is not actually allowed even though the exception from sql server mentions 2100 as a max, perhaps it is 2099 
+        /// that is max. I've reduced it to 2000 anyways.
+        /// </remarks>
+        internal static IDbCommand[] GenerateBulkInsertCommand<T>(
+            this Database db, 
+            IEnumerable<T> collection, 
+            IDbConnection connection,             
+            out string[] sql)
+        {
+            //A filter used below a few times to get all columns except result cols and not the primary key if it is auto-incremental
+            Func<Database.PocoData, KeyValuePair<string, Database.PocoColumn>, bool> includeColumn = (data, column) =>
+                {
+                    if (column.Value.ResultColumn) return false;
+                    if (data.TableInfo.AutoIncrement && column.Key == data.TableInfo.PrimaryKey) return false;
+                    return true;
+                };
+
+            var pd = Database.PocoData.ForType(typeof(T));
+            var tableName = db.EscapeTableName(pd.TableInfo.TableName);
+
+            //get all columns to include and format for sql
+            var cols = string.Join(", ", 
+                pd.Columns
+                .Where(c => includeColumn(pd, c))
+                .Select(c => tableName + "." + db.EscapeSqlIdentifier(c.Key)).ToArray());
+
+            var itemArray = collection.ToArray();
+
+            //calculate number of parameters per item
+            var paramsPerItem = pd.Columns.Count(i => includeColumn(pd, i));
+            
+            //Example calc:
+            // Given: we have 4168 items in the itemArray, each item contains 8 command parameters (values to be inserterted)                
+            // 2100 / 8 = 262.5
+            // Math.Floor(2100 / 8) = 262 items per trans
+            // 4168 / 262 = 15.908... = there will be 16 trans in total
+
+            //all items will be included if we have disabled db parameters
+            var itemsPerTrans = Math.Floor(2000.00 / paramsPerItem);
+            //there will only be one transaction if we have disabled db parameters
+            var numTrans = Math.Ceiling(itemArray.Length / itemsPerTrans);
+
+            var sqlQueries = new List<string>();
+            var commands = new List<IDbCommand>();
+
+            for (var tIndex = 0; tIndex < numTrans; tIndex++)
+            {
+                var itemsForTrans = itemArray
+                    .Skip(tIndex * (int)itemsPerTrans)
+                    .Take((int)itemsPerTrans);
+
+                var cmd = db.CreateCommand(connection, "");
+                var pocoValues = new List<string>();
+                var index = 0;
+                foreach (var poco in itemsForTrans)
+                {
+                    var values = new List<string>();
+                    //get all columns except result cols and not the primary key if it is auto-incremental
+                    foreach (var i in pd.Columns.Where(x => includeColumn(pd, x)))
+                    {
+                        db.AddParam(cmd, i.Value.GetValue(poco), "@");
+                        values.Add(string.Format("{0}{1}", "@", index++));
+                    }
+                    pocoValues.Add("(" + string.Join(",", values.ToArray()) + ")");
+                }
+
+                var sqlResult = string.Format("INSERT INTO {0} ({1}) VALUES {2}", tableName, cols, string.Join(", ", pocoValues)); 
+                sqlQueries.Add(sqlResult);
+                commands.Add(cmd);
+            }
+
+            sql = sqlQueries.ToArray();
+
+            return commands.ToArray();    
+        }
+
        public static void CreateTable(this Database db, bool overwrite, Type modelType)
        {
            var tableDefinition = DefinitionFactory.GetTableDefinition(modelType);
@@ -67,7 +213,7 @@ namespace Umbraco.Core.Persistence
                        //Turn on identity insert if db provider is not mysql
                        if (SqlSyntaxContext.SqlSyntaxProvider.SupportsIdentityInsert() && tableDefinition.Columns.Any(x => x.IsIdentity))
                            db.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(tableName))));
-                        
+
                        //Call the NewTable-event to trigger the insert of base/default data
                        NewTable(tableName, db, e);

@@ -106,7 +252,7 @@ namespace Umbraco.Core.Persistence
        public static void DropTable<T>(this Database db)
            where T : new()
        {
-            Type type = typeof (T);
+            Type type = typeof(T);
            var tableNameAttribute = type.FirstAttribute<TableNameAttribute>();
            if (tableNameAttribute == null)
                throw new Exception(
@@ -184,5 +330,5 @@ namespace Umbraco.Core.Persistence
        }
    }

-    internal class TableCreationEventArgs : System.ComponentModel.CancelEventArgs{}
+    internal class TableCreationEventArgs : System.ComponentModel.CancelEventArgs { }
 }
@@ -0,0 +1,101 @@
+using System;
+using System.Globalization;
+
+namespace Umbraco.Core.Persistence.Querying
+{
+    /// <summary>
+    /// Logic that is shared with the expression helpers
+    /// </summary>
+    internal class BaseExpressionHelper
+    {
+        public virtual string GetQuotedValue(object value, Type fieldType, Func<object, string> escapeCallback = null, Func<Type, bool> shouldQuoteCallback = null)
+        {
+            if (value == null) return "NULL";
+
+            if (escapeCallback == null)
+            {
+                escapeCallback = EscapeParam;
+            }
+            if (shouldQuoteCallback == null)
+            {
+                shouldQuoteCallback = ShouldQuoteValue;
+            }
+
+            if (!fieldType.UnderlyingSystemType.IsValueType && fieldType != typeof(string))
+            {
+                //if (TypeSerializer.CanCreateFromString(fieldType))
+                //{
+                //    return "'" + EscapeParam(TypeSerializer.SerializeToString(value)) + "'";
+                //}
+
+                throw new NotSupportedException(
+                    string.Format("Property of type: {0} is not supported", fieldType.FullName));
+            }
+
+            if (fieldType == typeof(int))
+                return ((int)value).ToString(CultureInfo.InvariantCulture);
+
+            if (fieldType == typeof(float))
+                return ((float)value).ToString(CultureInfo.InvariantCulture);
+
+            if (fieldType == typeof(double))
+                return ((double)value).ToString(CultureInfo.InvariantCulture);
+
+            if (fieldType == typeof(decimal))
+                return ((decimal)value).ToString(CultureInfo.InvariantCulture);
+
+            if (fieldType == typeof(DateTime))
+            {
+                return "'" + EscapeParam(((DateTime)value).ToIsoString()) + "'";
+            }
+
+            if (fieldType == typeof(bool))
+                return ((bool)value) ? Convert.ToString(1, CultureInfo.InvariantCulture) : Convert.ToString(0, CultureInfo.InvariantCulture);
+
+            return ShouldQuoteValue(fieldType)
+                       ? "'" + EscapeParam(value) + "'"
+                       : value.ToString();
+        }
+
+        public virtual string EscapeParam(object paramValue)
+        {
+            return paramValue.ToString().Replace("'", "''");
+        }
+
+        public virtual string EscapeAtArgument(string exp)
+        {
+            if (exp.StartsWith("@"))
+                return string.Concat("@", exp);
+
+            return exp;
+        }
+
+        public virtual bool ShouldQuoteValue(Type fieldType)
+        {
+            return true;
+        }
+
+        protected virtual string RemoveQuote(string exp)
+        {
+            if (exp.StartsWith("'") && exp.EndsWith("'"))
+            {
+                exp = exp.Remove(0, 1);
+                exp = exp.Remove(exp.Length - 1, 1);
+            }
+            return exp;
+        }
+
+        protected virtual string RemoveQuoteFromAlias(string exp)
+        {
+
+            if ((exp.StartsWith("\"") || exp.StartsWith("`") || exp.StartsWith("'"))
+                &&
+                (exp.EndsWith("\"") || exp.EndsWith("`") || exp.EndsWith("'")))
+            {
+                exp = exp.Remove(0, 1);
+                exp = exp.Remove(exp.Length - 1, 1);
+            }
+            return exp;
+        }
+    }
+}
@@ -8,7 +8,7 @@ using Umbraco.Core.Persistence.Mappers;

 namespace Umbraco.Core.Persistence.Querying
 {
-    internal class ModelToSqlExpressionHelper<T>
+    internal class ModelToSqlExpressionHelper<T> : BaseExpressionHelper
    {
        private string sep = " ";
        private BaseMapper _mapper;
@@ -246,7 +246,7 @@ namespace Umbraco.Core.Persistence.Querying
                case "ToLower":
                    return string.Format("lower({0})", r);
                case "StartsWith":
-                    return string.Format("upper({0}) like '{1}%'", r, RemoveQuote(args[0].ToString().ToUpper()));
+                    return string.Format("upper({0}) like '{1}%'", r, EscapeAtArgument(RemoveQuote(args[0].ToString().ToUpper())));
                case "EndsWith":
                    return string.Format("upper({0}) like '%{1}'", r, RemoveQuote(args[0].ToString()).ToUpper());
                case "Contains":
@@ -435,69 +435,7 @@ namespace Umbraco.Core.Persistence.Querying

        public virtual string GetQuotedValue(object value, Type fieldType)
        {
-            if (value == null) return "NULL";
-
-            if (!fieldType.UnderlyingSystemType.IsValueType && fieldType != typeof(string))
-            {
-                throw new NotSupportedException(
-                    string.Format("Property of type: {0} is not supported", fieldType.FullName));
-            }
-
-            if (fieldType == typeof(int))
-                return ((int)value).ToString(CultureInfo.InvariantCulture);
-
-            if (fieldType == typeof(float))
-                return ((float)value).ToString(CultureInfo.InvariantCulture);
-
-            if (fieldType == typeof(double))
-                return ((double)value).ToString(CultureInfo.InvariantCulture);
-
-            if (fieldType == typeof(decimal))
-                return ((decimal)value).ToString(CultureInfo.InvariantCulture);
-
-            if (fieldType == typeof(DateTime))
-                return "'" + EscapeParam(((DateTime)value).ToString(CultureInfo.InvariantCulture)) + "'";
-            
-            if (fieldType == typeof(bool))
-                return ((bool)value) ? Convert.ToString(1, CultureInfo.InvariantCulture) : Convert.ToString(0, CultureInfo.InvariantCulture);
-            
-            return ShouldQuoteValue(fieldType)
-                    ? "'" + EscapeParam(value) + "'"
-                    : value.ToString();
-        }
-
-        public virtual string EscapeParam(object paramValue)
-        {
-            return paramValue.ToString().Replace("'", "''");
-        }
-
-        public virtual bool ShouldQuoteValue(Type fieldType)
-        {
-            return true;
-        }
-
-        protected string RemoveQuote(string exp)
-        {
-
-            if (exp.StartsWith("'") && exp.EndsWith("'"))
-            {
-                exp = exp.Remove(0, 1);
-                exp = exp.Remove(exp.Length - 1, 1);
-            }
-            return exp;
-        }
-
-        protected string RemoveQuoteFromAlias(string exp)
-        {
-
-            if ((exp.StartsWith("\"") || exp.StartsWith("`") || exp.StartsWith("'"))
-                &&
-                (exp.EndsWith("\"") || exp.EndsWith("`") || exp.EndsWith("'")))
-            {
-                exp = exp.Remove(0, 1);
-                exp = exp.Remove(exp.Length - 1, 1);
-            }
-            return exp;
+            return GetQuotedValue(value, fieldType, EscapeParam, ShouldQuoteValue);
        }

        private string GetTrueExpression()
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
@@ -9,7 +8,7 @@ using Umbraco.Core.Persistence.SqlSyntax;

 namespace Umbraco.Core.Persistence.Querying
 {
-    internal class PocoToSqlExpressionHelper<T>
+    internal class PocoToSqlExpressionHelper<T> : BaseExpressionHelper
    {
        private string sep = " ";
        private Database.PocoData pd;
@@ -251,7 +250,7 @@ namespace Umbraco.Core.Persistence.Querying
                case "ToLower":
                    return string.Format("lower({0})", r);
                case "StartsWith":
-                    return string.Format("upper({0}) like '{1}%'", r, RemoveQuote(args[0].ToString().ToUpper()));
+                    return string.Format("upper({0}) like '{1}%'", r, EscapeAtArgument(RemoveQuote(args[0].ToString().ToUpper())));
                case "EndsWith":
                    return string.Format("upper({0}) like '%{1}'", r, RemoveQuote(args[0].ToString()).ToUpper());
                case "Contains":
@@ -440,50 +439,7 @@ namespace Umbraco.Core.Persistence.Querying

        public virtual string GetQuotedValue(object value, Type fieldType)
        {
-            if (value == null) return "NULL";
-
-            if (!fieldType.UnderlyingSystemType.IsValueType && fieldType != typeof(string))
-            {
-                //if (TypeSerializer.CanCreateFromString(fieldType))
-                //{
-                //    return "'" + EscapeParam(TypeSerializer.SerializeToString(value)) + "'";
-                //}
-
-                throw new NotSupportedException(
-                    string.Format("Property of type: {0} is not supported", fieldType.FullName));
-            }
-
-            if (fieldType == typeof(int))
-                return ((int)value).ToString(CultureInfo.InvariantCulture);
-
-            if (fieldType == typeof(float))
-                return ((float)value).ToString(CultureInfo.InvariantCulture);
-
-            if (fieldType == typeof(double))
-                return ((double)value).ToString(CultureInfo.InvariantCulture);
-
-            if (fieldType == typeof(decimal))
-                return ((decimal)value).ToString(CultureInfo.InvariantCulture);
-
-            if(fieldType == typeof(DateTime))
-                return "'" + EscapeParam(((DateTime)value).ToString(CultureInfo.InvariantCulture)) + "'";
-
-            if (fieldType == typeof(bool))
-                return ((bool)value) ? Convert.ToString(1, CultureInfo.InvariantCulture) : Convert.ToString(0, CultureInfo.InvariantCulture);
-
-            return ShouldQuoteValue(fieldType)
-                    ? "'" + EscapeParam(value) + "'"
-                    : value.ToString();
-        }
-
-        public virtual string EscapeParam(object paramValue)
-        {
-            return paramValue.ToString().Replace("'", "''");
-        }
-
-        public virtual bool ShouldQuoteValue(Type fieldType)
-        {
-            return true;
+            return GetQuotedValue(value, fieldType, EscapeParam, ShouldQuoteValue);
        }

        protected virtual string GetFieldName(Database.PocoData pocoData, string name)
@@ -494,30 +450,6 @@ namespace Umbraco.Core.Persistence.Querying
                SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName(column.Value.ColumnName));
        }

-        protected string RemoveQuote(string exp)
-        {
-
-            if (exp.StartsWith("'") && exp.EndsWith("'"))
-            {
-                exp = exp.Remove(0, 1);
-                exp = exp.Remove(exp.Length - 1, 1);
-            }
-            return exp;
-        }
-
-        protected string RemoveQuoteFromAlias(string exp)
-        {
-
-            if ((exp.StartsWith("\"") || exp.StartsWith("`") || exp.StartsWith("'"))
-                &&
-                (exp.EndsWith("\"") || exp.EndsWith("`") || exp.EndsWith("'")))
-            {
-                exp = exp.Remove(0, 1);
-                exp = exp.Remove(exp.Length - 1, 1);
-            }
-            return exp;
-        }
-
        private string GetTrueExpression()
        {
            object o = GetQuotedTrueValue();
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models.Rdbms;
+
+namespace Umbraco.Core.Persistence.Relators
+{
+    internal class UserSectionRelator
+    {
+        internal UserDto Current;
+
+        internal UserDto Map(UserDto a, User2AppDto p)
+        {
+            // Terminating call.  Since we can return null from this function
+            // we need to be ready for PetaPoco to callback later with null
+            // parameters
+            if (a == null)
+                return Current;
+
+            // Is this the same DictionaryItem as the current one we're processing
+            if (Current != null && Current.Id == a.Id)
+            {
+                // Yes, just add this User2AppDto to the current item's collection
+                Current.User2AppDtos.Add(p);
+
+                // Return null to indicate we're not done with this User yet
+                return null;
+            }
+
+            // This is a different User to the current one, or this is the 
+            // first time through and we don't have one yet
+
+            // Save the current User
+            var prev = Current;
+
+            // Setup the new current User
+            Current = a;
+            Current.User2AppDtos = new List<User2AppDto>();
+            //this can be null since we are doing a left join
+            if (p.AppAlias != null)
+            {
+                Current.User2AppDtos.Add(p);    
+            }
+
+            // Return the now populated previous User (or null if first time through)
+            return prev;
+        }
+    }
+}
@@ -27,6 +27,8 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            _contentTypeRepository = contentTypeRepository;
            _templateRepository = templateRepository;
+
+            EnsureUniqueNaming = true;
        }

 		public ContentRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository)
@@ -34,8 +36,12 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            _contentTypeRepository = contentTypeRepository;
            _templateRepository = templateRepository;
+
+		    EnsureUniqueNaming = true;
        }

+        public bool EnsureUniqueNaming { get; set; }
+
        #region Overrides of RepositoryBase<IContent>

        protected override IContent PerformGet(int id)
@@ -164,11 +170,31 @@ namespace Umbraco.Core.Persistence.Repositories
            return content;
        }

+        public override void DeleteVersion(Guid versionId)
+        {
+            var sql = new Sql()
+                .Select("*")
+                .From<DocumentDto>()
+                .InnerJoin<ContentVersionDto>().On<ContentVersionDto, DocumentDto>(left => left.VersionId, right => right.VersionId)
+                .Where<ContentVersionDto>(x => x.VersionId == versionId)
+                .Where<DocumentDto>(x => x.Newest == true);
+            var dto = Database.Fetch<DocumentDto, ContentVersionDto>(sql).FirstOrDefault();
+
+            if(dto == null) return;
+
+            using (var transaction = Database.GetTransaction())
+            {
+                PerformDeleteVersion(dto.NodeId, versionId);
+
+                transaction.Complete();
+            }
+        }
+
        protected override void PerformDeleteVersion(int id, Guid versionId)
        {
            Database.Delete<PreviewXmlDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
-            Database.Delete<PropertyDataDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
-            Database.Delete<ContentVersionDto>("WHERE nodeId = @Id AND VersionId = @VersionId", new { Id = id, VersionId = versionId });
+            Database.Delete<PropertyDataDto>("WHERE contentNodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
+            Database.Delete<ContentVersionDto>("WHERE ContentId = @Id AND VersionId = @VersionId", new { Id = id, VersionId = versionId });
            Database.Delete<DocumentDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
        }

@@ -180,6 +206,9 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            ((Content)entity).AddingEntity();

+            //Ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
+
            var factory = new ContentFactory(NodeObjectTypeId, entity.Id);
            var dto = factory.BuildDto(entity);

@@ -197,7 +226,7 @@ namespace Umbraco.Core.Persistence.Repositories
            nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
            nodeDto.SortOrder = sortOrder;
            var o = Database.IsNew(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
-
+        
            //Update with new correct path
            nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
            Database.Update(nodeDto);
@@ -208,6 +237,24 @@ namespace Umbraco.Core.Persistence.Repositories
            entity.SortOrder = sortOrder;
            entity.Level = level;

+
+            //Assign the same permissions to it as the parent node
+            // http://issues.umbraco.org/issue/U4-2161            
+            var parentPermissions = GetPermissionsForEntity(entity.ParentId).ToArray();
+            //if there are parent permissions then assign them, otherwise leave null and permissions will become the
+            // user's default permissions.
+            if (parentPermissions.Any())
+            {
+                var userPermissions = parentPermissions.Select(
+                    permissionDto => new KeyValuePair<object, string>(
+                                         permissionDto.UserId,
+                                         permissionDto.Permission));                
+                AssignEntityPermissions(entity, userPermissions);
+                //flag the entity's permissions changed flag so we can track those changes.
+                //Currently only used for the cache refreshers to detect if we should refresh all user permissions cache.
+                ((Content) entity).PermissionsChanged = true;
+            }
+
            //Create the Content specific data - cmsContent
            var contentDto = dto.ContentVersionDto.ContentDto;
            contentDto.NodeId = nodeDto.NodeId;
@@ -248,8 +295,9 @@ namespace Umbraco.Core.Persistence.Repositories
        protected override void PersistUpdatedItem(IContent entity)
        {
            var publishedState = ((Content) entity).PublishedState;
-            //A new version should only be created if published state (or language) has changed
-            bool shouldCreateNewVersion = (((ICanBeDirty)entity).IsPropertyDirty("Published") && publishedState != PublishedState.Unpublished) || ((ICanBeDirty)entity).IsPropertyDirty("Language");
+            
+            //check if we need to create a new version
+            bool shouldCreateNewVersion = entity.ShouldCreateNewVersion(publishedState);
            if (shouldCreateNewVersion)
            {
                //Updates Modified date and Version Guid
@@ -260,6 +308,9 @@ namespace Umbraco.Core.Persistence.Repositories
                entity.UpdateDate = DateTime.Now;
            }

+            //Ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
+
            //Look up parent to get and set the correct Path and update SortOrder if ParentId has changed
            if (((ICanBeDirty)entity).IsPropertyDirty("ParentId"))
            {
@@ -271,6 +322,10 @@ namespace Umbraco.Core.Persistence.Repositories
                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
                        new {ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId});
                entity.SortOrder = maxSortOrder + 1;
+
+                //Question: If we move a node, should we update permissions to inherit from the new parent if the parent has permissions assigned?
+                // if we do that, then we'd need to propogate permissions all the way downward which might not be ideal for many people.
+                // Gonna just leave it as is for now, and not re-propogate permissions.
            }

            var factory = new ContentFactory(NodeObjectTypeId, entity.Id);
@@ -293,7 +348,8 @@ namespace Umbraco.Core.Persistence.Repositories

            //If Published state has changed then previous versions should have their publish state reset.
            //If state has been changed to unpublished the previous versions publish state should also be reset.
-            if (((ICanBeDirty)entity).IsPropertyDirty("Published") && (entity.Published || publishedState == PublishedState.Unpublished))
+            //if (((ICanBeDirty)entity).IsPropertyDirty("Published") && (entity.Published || publishedState == PublishedState.Unpublished))
+            if (entity.ShouldClearPublishedFlagForPreviousVersions(publishedState, shouldCreateNewVersion))            
            {
                var publishedDocs = Database.Fetch<DocumentDto>("WHERE nodeId = @Id AND published = @IsPublished", new { Id = entity.Id, IsPublished = true });
                foreach (var doc in publishedDocs)
@@ -304,19 +360,18 @@ namespace Umbraco.Core.Persistence.Repositories
                }
            }

+            //Look up (newest) entries by id in cmsDocument table to set newest = false
+            var documentDtos = Database.Fetch<DocumentDto>("WHERE nodeId = @Id AND newest = @IsNewest", new { Id = entity.Id, IsNewest = true });
+            foreach (var documentDto in documentDtos)
+            {
+                var docDto = documentDto;
+                docDto.Newest = false;
+                Database.Update(docDto);
+            }
+
            var contentVersionDto = dto.ContentVersionDto;
            if (shouldCreateNewVersion)
            {
-                //Look up (newest) entries by id in cmsDocument table to set newest = false
-                //NOTE: This is only relevant when a new version is created, which is why its done inside this if-statement.
-                var documentDtos = Database.Fetch<DocumentDto>("WHERE nodeId = @Id AND newest = @IsNewest", new { Id = entity.Id, IsNewest = true });
-                foreach (var documentDto in documentDtos)
-                {
-                    var docDto = documentDto;
-                    docDto.Newest = false;
-                    Database.Update(docDto);
-                }
-
                //Create a new version - cmsContentVersion
                //Assumes a new Version guid and Version date (modified date) has been set
                Database.Insert(contentVersionDto);
@@ -415,7 +470,19 @@ namespace Umbraco.Core.Persistence.Repositories

            foreach (var dto in dtos)
            {
-                yield return CreateContentFromDto(dto, dto.VersionId);
+                //Check in the cache first. If it exists there AND it is published
+                // then we can use that entity. Otherwise if it is not published (which can be the case
+                // because we only store the 'latest' entries in the cache which might not be the published
+                // version)
+                var fromCache = TryGetFromCache(dto.NodeId);
+                if (fromCache.Success && fromCache.Result.Published)
+                {
+                    yield return fromCache.Result;
+                }
+                else
+                {
+                    yield return CreateContentFromDto(dto, dto.VersionId);    
+                }
            }
        }

@@ -435,7 +502,7 @@ namespace Umbraco.Core.Persistence.Repositories
        }

        #endregion
-
+        
        /// <summary>
        /// Private method to create a content object from a DocumentDto, which is used by Get and GetByVersion.
        /// </summary>
@@ -489,5 +556,37 @@ namespace Umbraco.Core.Persistence.Repositories

            return new PropertyCollection(properties);
        }
+
+        private string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
+        {
+            if (EnsureUniqueNaming == false)
+                return nodeName;
+
+            var sql = new Sql();
+            sql.Select("*")
+               .From<NodeDto>()
+               .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.ParentId == parentId && x.Text.StartsWith(nodeName));
+
+            int uniqueNumber = 1;
+            var currentName = nodeName;
+
+            var dtos = Database.Fetch<NodeDto>(sql);
+            if (dtos.Any())
+            {
+                var results = dtos.OrderBy(x => x.Text, new SimilarNodeNameComparer());
+                foreach (var dto in results)
+                {
+                    if(id != 0 && id == dto.NodeId) continue;
+
+                    if (dto.Text.ToLowerInvariant().Equals(currentName.ToLowerInvariant()))
+                    {
+                        currentName = nodeName + string.Format(" ({0})", uniqueNumber);
+                        uniqueNumber++;
+                    }
+                }
+            }
+
+            return currentName;
+        }
    }
 }
@@ -203,7 +203,7 @@ namespace Umbraco.Core.Persistence.Repositories
                   .Where<NodeDto>(x => x.NodeObjectType == new Guid(Constants.ObjectTypes.Document))
                   .Where<ContentDto>(x => x.ContentTypeId == entity.Id);

-                var contentDtos = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto>(sql);
+                var contentDtos = Database.Fetch<ContentDto, NodeDto>(sql);
                //Loop through all tracked keys, which corresponds to the ContentTypes that has been removed from the composition
                foreach (var key in compositionBase.RemovedContentTypeKeyTracker)
                {
@@ -321,7 +321,7 @@ namespace Umbraco.Core.Persistence.Repositories
            sql.Select("*")
               .From<ContentTypeAllowedContentTypeDto>()
               .LeftJoin<ContentTypeDto>()
-               .On<ContentTypeAllowedContentTypeDto, ContentTypeDto>(left => left.Id, right => right.NodeId)
+               .On<ContentTypeAllowedContentTypeDto, ContentTypeDto>(left => left.AllowedId, right => right.NodeId)
               .Where<ContentTypeAllowedContentTypeDto>(x => x.Id == id);

            var allowedContentTypeDtos = Database.Fetch<ContentTypeAllowedContentTypeDto, ContentTypeDto>(sql);
@@ -84,7 +84,7 @@ namespace Umbraco.Core.Persistence.Repositories
            {
                bool isContent = objectTypeId == new Guid(Constants.ObjectTypes.Document);
                bool isMedia = objectTypeId == new Guid(Constants.ObjectTypes.Media);
-                var sql = GetBaseWhere(GetBase, isContent, isMedia, objectTypeId).Append(GetGroupBy(isContent, isMedia));
+                var sql = GetBaseWhere(GetBase, isContent, isMedia, string.Empty, objectTypeId).Append(GetGroupBy(isContent, isMedia));
                var dtos = isMedia
                               ? _work.Database.Fetch<UmbracoEntityDto, UmbracoPropertyDto, UmbracoEntityDto>(
                                   new UmbracoEntityRelator().Map, sql)
@@ -101,7 +101,8 @@ namespace Umbraco.Core.Persistence.Repositories

        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query)
        {
-            var sqlClause = GetBase(false, false);
+            var wheres = string.Concat(" AND ", string.Join(" AND ", ((Query<IUmbracoEntity>) query).WhereClauses()));
+            var sqlClause = GetBase(false, false, wheres);
            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
            var sql = translator.Translate().Append(GetGroupBy(false, false));

@@ -117,7 +118,9 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            bool isContent = objectTypeId == new Guid(Constants.ObjectTypes.Document);
            bool isMedia = objectTypeId == new Guid(Constants.ObjectTypes.Media);
-            var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, objectTypeId);
+
+            var wheres = string.Concat(" AND ", string.Join(" AND ", ((Query<IUmbracoEntity>)query).WhereClauses()));
+            var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, wheres, objectTypeId);
            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
            var sql = translator.Translate().Append(GetGroupBy(isContent, isMedia));

@@ -136,7 +139,7 @@ namespace Umbraco.Core.Persistence.Repositories

        #region Sql Statements

-        protected virtual Sql GetBase(bool isContent, bool isMedia)
+        protected virtual Sql GetBase(bool isContent, bool isMedia, string additionWhereStatement = "")
        {
            var columns = new List<object>
                              {
@@ -187,42 +190,38 @@ namespace Umbraco.Core.Persistence.Repositories
                   .On("umbracoNode.id = latest.nodeId");
            }

-            /*if (isContent)
-            {
-                sql.LeftJoin(
-                    "(SELECT contentNodeId, versionId, dataNvarchar, controlId FROM cmsPropertyData INNER JOIN cmsPropertyType ON cmsPropertyType.id = cmsPropertyData.propertytypeid" +
-                    " INNER JOIN cmsDataType ON cmsPropertyType.dataTypeId = cmsDataType.nodeId) as property")
-                   .On("umbracoNode.id = property.contentNodeId AND latest.versionId = property.versionId");
-            }*/
            if (isMedia)
            {
                sql.LeftJoin(
-                    "(SELECT contentNodeId, versionId, dataNvarchar, controlId FROM cmsPropertyData INNER JOIN cmsPropertyType ON cmsPropertyType.id = cmsPropertyData.propertytypeid" +
-                    " INNER JOIN cmsDataType ON cmsPropertyType.dataTypeId = cmsDataType.nodeId) as property")
+                    "(SELECT contentNodeId, versionId, dataNvarchar, controlId FROM cmsPropertyData " +
+                    "INNER JOIN umbracoNode ON cmsPropertyData.contentNodeId = umbracoNode.id " +
+                    "INNER JOIN cmsPropertyType ON cmsPropertyType.id = cmsPropertyData.propertytypeid " +
+                    "INNER JOIN cmsDataType ON cmsPropertyType.dataTypeId = cmsDataType.nodeId "+
+                    "WHERE umbracoNode.nodeObjectType = '" + Constants.ObjectTypes.Media + "'" + additionWhereStatement + ") as property")
                   .On("umbracoNode.id = property.contentNodeId");
            }

            return sql;
        }

-        protected virtual Sql GetBaseWhere(Func<bool, bool, Sql> baseQuery, bool isContent, bool isMedia, Guid id)
+        protected virtual Sql GetBaseWhere(Func<bool, bool, string, Sql> baseQuery, bool isContent, bool isMedia, string additionWhereStatement, Guid id)
        {
-            var sql = baseQuery(isContent, isMedia)
+            var sql = baseQuery(isContent, isMedia, additionWhereStatement)
                .Where("umbracoNode.nodeObjectType = @NodeObjectType", new { NodeObjectType = id });
            return sql;
        }

-        protected virtual Sql GetBaseWhere(Func<bool, bool, Sql> baseQuery, bool isContent, bool isMedia, int id)
+        protected virtual Sql GetBaseWhere(Func<bool, bool, string, Sql> baseQuery, bool isContent, bool isMedia, int id)
        {
-            var sql = baseQuery(isContent, isMedia)
+            var sql = baseQuery(isContent, isMedia, " AND umbracoNode.id = '"+ id +"'")
                .Where("umbracoNode.id = @Id", new { Id = id })
                .Append(GetGroupBy(isContent, isMedia));
            return sql;
        }

-        protected virtual Sql GetBaseWhere(Func<bool, bool, Sql> baseQuery, bool isContent, bool isMedia, Guid objectId, int id)
+        protected virtual Sql GetBaseWhere(Func<bool, bool, string, Sql> baseQuery, bool isContent, bool isMedia, Guid objectId, int id)
        {
-            var sql = baseQuery(isContent, isMedia)
+            var sql = baseQuery(isContent, isMedia, " AND umbracoNode.id = '"+ id +"'")
                .Where("umbracoNode.id = @Id AND umbracoNode.nodeObjectType = @NodeObjectType",
                       new {Id = id, NodeObjectType = objectId});
            return sql;
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Querying;

@@ -15,7 +16,7 @@ namespace Umbraco.Core.Persistence.Repositories
        IContent GetByLanguage(int id, string language);

        /// <summary>
-        /// Gets all published Content byh the specified query
+        /// Gets all published Content by the specified query
        /// </summary>
        /// <param name="query">Query to execute against published versions</param>
        /// <returns>An enumerable list of <see cref="IContent"/></returns>
@@ -4,6 +4,5 @@ namespace Umbraco.Core.Persistence.Repositories
 {
    public interface IMediaRepository : IRepositoryVersionable<int, IMedia>
    {
-         
    }
 }
@@ -9,8 +9,7 @@ namespace Umbraco.Core.Persistence.Repositories
    /// </summary>
    /// <typeparam name="TEntity">Type of <see cref="IAggregateRoot"/> entity for which the repository is used</typeparam>
    /// <typeparam name="TId">Type of the Id used for this entity</typeparam>
-    public interface IRepositoryQueryable<TId, TEntity> : IRepository<TId, TEntity>
-        where TEntity : IAggregateRoot
+    public interface IRepositoryQueryable<in TId, TEntity> : IRepository<TId, TEntity>
    {
        /// <summary>
        /// Gets all entities of the specified type and query
@@ -1,9 +1,18 @@
-using Umbraco.Core.Models.Membership;
+using System.Collections.Generic;
+using Umbraco.Core.Models.Membership;

 namespace Umbraco.Core.Persistence.Repositories
 {
    internal interface IUserRepository : IRepositoryQueryable<int, IUser>
    {
-        IProfile GetProfileById(int id);
+        //IProfile GetProfileById(int id);
+        //IProfile GetProfileByUserName(string username);
+        //IUser GetUserByUserName(string username);
+        
+        /// <summary>
+        /// This is useful when an entire section is removed from config
+        /// </summary>
+        /// <param name="sectionAlias"></param>
+        IEnumerable<IUser> GetUsersAssignedToSection(string sectionAlias);
    }
 }
@@ -25,14 +25,20 @@ namespace Umbraco.Core.Persistence.Repositories
            : base(work)
        {
            _mediaTypeRepository = mediaTypeRepository;
+
+            EnsureUniqueNaming = true;
        }

 		public MediaRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache, IMediaTypeRepository mediaTypeRepository)
            : base(work, cache)
        {
            _mediaTypeRepository = mediaTypeRepository;
+
+            EnsureUniqueNaming = true;
        }

+        public bool EnsureUniqueNaming { get; set; }
+
        #region Overrides of RepositoryBase<int,IMedia>

        protected override IMedia PerformGet(int id)
@@ -170,8 +176,8 @@ namespace Umbraco.Core.Persistence.Repositories
        protected override void PerformDeleteVersion(int id, Guid versionId)
        {
            Database.Delete<PreviewXmlDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
-            Database.Delete<PropertyDataDto>("WHERE nodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
-            Database.Delete<ContentVersionDto>("WHERE nodeId = @Id AND VersionId = @VersionId", new { Id = id, VersionId = versionId });
+            Database.Delete<PropertyDataDto>("WHERE contentNodeId = @Id AND versionId = @VersionId", new { Id = id, VersionId = versionId });
+            Database.Delete<ContentVersionDto>("WHERE ContentId = @Id AND VersionId = @VersionId", new { Id = id, VersionId = versionId });
        }

        #endregion
@@ -182,6 +188,9 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            ((Models.Media)entity).AddingEntity();

+            //Ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
+
            var factory = new MediaFactory(NodeObjectTypeId, entity.Id);
            var dto = factory.BuildDto(entity);

@@ -246,6 +255,9 @@ namespace Umbraco.Core.Persistence.Repositories
            //Updates Modified date
            ((Models.Media)entity).UpdatingEntity();

+            //Ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
+
            //Look up parent to get and set the correct Path and update SortOrder if ParentId has changed
            if (((ICanBeDirty)entity).IsPropertyDirty("ParentId"))
            {
@@ -370,5 +382,37 @@ namespace Umbraco.Core.Persistence.Repositories

            return new PropertyCollection(properties);
        }
+
+        private string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
+        {
+            if (EnsureUniqueNaming == false)
+                return nodeName;
+
+            var sql = new Sql();
+            sql.Select("*")
+               .From<NodeDto>()
+               .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.ParentId == parentId && x.Text.StartsWith(nodeName));
+
+            int uniqueNumber = 1;
+            var currentName = nodeName;
+
+            var dtos = Database.Fetch<NodeDto>(sql);
+            if (dtos.Any())
+            {
+                var results = dtos.OrderBy(x => x.Text, new SimilarNodeNameComparer());
+                foreach (var dto in results)
+                {
+                    if (id != 0 && id == dto.NodeId) continue;
+
+                    if (dto.Text.ToLowerInvariant().Equals(currentName.ToLowerInvariant()))
+                    {
+                        currentName = nodeName + string.Format(" ({0})", uniqueNumber);
+                        uniqueNumber++;
+                    }
+                }
+            }
+
+            return currentName;
+        }
    }
 }
@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
+using System.Text;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Caching;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    /// <summary>
+    /// A repository that exposes functionality to modify assigned permissions to a node
+    /// </summary>
+    /// <typeparam name="TId"></typeparam>
+    /// <typeparam name="TEntity"></typeparam>
+    internal abstract class PermissionRepository<TId, TEntity> : PetaPocoRepositoryBase<TId, TEntity>
+        where TEntity : class, IAggregateRoot
+    {
+        protected PermissionRepository(IDatabaseUnitOfWork work)
+            : base(work)
+        {
+        }
+
+        protected PermissionRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache)
+            : base(work, cache)
+        {
+        }
+
+        protected internal IEnumerable<User2NodePermissionDto> GetPermissionsForEntity(int entityId)
+        {
+            var sql = new Sql();
+            sql.Select("*")
+                .From<User2NodePermissionDto>()
+                .Where<User2NodePermissionDto>(dto => dto.NodeId == entityId);
+            return Database.Fetch<User2NodePermissionDto>(sql);
+        }
+
+        /// <summary>
+        /// Assigns permissions to an entity for multiple users
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permissions"></param>
+        /// <param name="userIds"></param>
+        protected internal void AssignEntityPermissions(TEntity entity, string permissions, IEnumerable<object> userIds)
+        {
+            var actions = userIds.Select(id => new User2NodePermissionDto
+                {
+                    NodeId = entity.Id,
+                    Permission = permissions,
+                    UserId = (int)id
+                });
+
+            Database.BulkInsertRecords(actions);
+        }
+
+        /// <summary>
+        /// Assigns permissions to an entity for multiple users/permission entries
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="userPermissions">
+        /// A key/value pair list containing a userId and a permission to assign
+        /// </param>
+        protected internal void AssignEntityPermissions(TEntity entity, IEnumerable<KeyValuePair<object, string>> userPermissions)
+        {
+            var actions = userPermissions.Select(p => new User2NodePermissionDto
+            {
+                NodeId = entity.Id,
+                Permission = p.Value,
+                UserId = (int)p.Key
+            });
+
+            Database.BulkInsertRecords(actions);
+        }
+
+        /// <summary>
+        /// Replace permissions for an entity for multiple users
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permissions"></param>
+        /// <param name="userIds"></param>
+        protected internal void ReplaceEntityPermissions(TEntity entity, string permissions, IEnumerable<object> userIds)
+        {            
+            Database.Update<User2NodePermissionDto>(
+                GenerateReplaceEntityPermissionsSql(entity.Id, permissions, userIds.ToArray()));
+        }
+
+        /// <summary>
+        /// An overload to replace entity permissions and all replace all descendant permissions
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permissions"></param>
+        /// <param name="getDescendantIds">
+        /// A callback to get the descendant Ids of the current entity
+        /// </param>
+        /// <param name="userIds"></param>
+        protected internal void ReplaceEntityPermissions(TEntity entity, string permissions, Func<IEntity, IEnumerable<int>> getDescendantIds, IEnumerable<object> userIds)
+        {
+            Database.Update<User2NodePermissionDto>(
+                GenerateReplaceEntityPermissionsSql(
+                new[] {entity.Id}.Concat(getDescendantIds(entity)).ToArray(), 
+                permissions, 
+                userIds.ToArray()));
+        }
+
+        internal static string GenerateReplaceEntityPermissionsSql(int entityId, string permissions, object[] userIds)
+        {
+            return GenerateReplaceEntityPermissionsSql(new[] {entityId}, permissions, userIds);
+        }
+
+        internal static string GenerateReplaceEntityPermissionsSql(int[] entityIds, string permissions, object[] userIds)
+        {
+            //create the "SET" clause of the update statement
+            var sqlSet = string.Format("SET {0}={1}",
+                                    SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("permission"),
+                                    SqlSyntaxContext.SqlSyntaxProvider.GetQuotedValue(permissions));
+
+            //build the nodeIds part of the where clause
+            var sqlNodeWhere = BuildOrClause(entityIds, "nodeId");
+            
+            //build up the userIds part of the where clause
+            var userWhereBuilder = BuildOrClause(userIds, "userId");
+
+            var sqlWhere = new Sql();
+            sqlWhere.Where(string.Format("{0} AND {1}", sqlNodeWhere, userWhereBuilder));
+
+            return string.Format("{0} {1}", sqlSet, sqlWhere.SQL);
+        }
+
+        private static string BuildOrClause<T>(IEnumerable<T> ids, string colName)
+        {
+            var asArray = ids.ToArray();
+            var userWhereBuilder = new StringBuilder();
+            userWhereBuilder.Append("(");
+            for (var index = 0; index < asArray.Length; index++)
+            {
+                var userId = asArray[index];
+                userWhereBuilder.Append(SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName(colName));
+                userWhereBuilder.Append("=");
+                userWhereBuilder.Append(userId);
+                if (index < asArray.Length - 1)
+                {
+                    userWhereBuilder.Append(" OR ");
+                }
+            }
+            userWhereBuilder.Append(")");
+            return userWhereBuilder.ToString();
+        }
+    }
+}
@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    /// <summary>
+    /// Represents a repository specific to the Recycle Bins
+    /// available for Content and Media.
+    /// </summary>
+    internal class RecycleBinRepository : DisposableObject
+    {
+        private readonly IDatabaseUnitOfWork _unitOfWork;
+
+        public RecycleBinRepository(IDatabaseUnitOfWork unitOfWork)
+        {
+            _unitOfWork = unitOfWork;
+        }
+
+        /// <summary>
+        /// Gets a list of files, which are referenced on items in the Recycle Bin.
+        /// The list is generated by the convention that a file is referenced by 
+        /// the Upload data type or a property type with the alias 'umbracoFile'.
+        /// </summary>
+        /// <param name="nodeObjectType"></param>
+        /// <returns></returns>
+        public List<string> GetFilesInRecycleBin(Guid nodeObjectType)
+        {
+            var db = _unitOfWork.Database;
+
+            //Issue query to get all trashed content or media that has the Upload field as a property
+            //The value for each field is stored in a list: FilesToDelete<string>()
+            //Alias: Constants.Conventions.Media.File and ControlId: Constants.PropertyEditors.UploadField
+            var sql = new Sql();
+            sql.Select("DISTINCT(dataNvarchar)")
+                .From<PropertyDataDto>()
+                .InnerJoin<NodeDto>().On<PropertyDataDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
+                .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
+                .Where("umbracoNode.trashed = '1' AND umbracoNode.nodeObjectType = @NodeObjectType AND dataNvarchar IS NOT NULL AND (cmsPropertyType.Alias = @FileAlias OR cmsDataType.controlId = @ControlId)",
+                    new { FileAlias = Constants.Conventions.Media.File, NodeObjectType = nodeObjectType, ControlId = Constants.PropertyEditors.UploadField });
+
+            var files = db.Fetch<string>(sql);
+            return files;
+        }
+
+        /// <summary>
+        /// Gets a list of Ids for each of the items in the Recycle Bin.
+        /// </summary>
+        /// <param name="nodeObjectType"></param>
+        /// <returns></returns>
+        public List<int> GetIdsOfItemsInRecycleBin(Guid nodeObjectType)
+        {
+            var db = _unitOfWork.Database;
+
+            var idsSql = new Sql();
+            idsSql.Select("DISTINCT(id)")
+                .From<NodeDto>()
+                .Where<NodeDto>(x => x.Trashed && x.NodeObjectType == nodeObjectType);
+
+            var ids = db.Fetch<int>(idsSql);
+            return ids;
+        }
+
+        /// <summary>
+        /// Empties the Recycle Bin by running single bulk-Delete queries
+        /// against the Content- or Media's Recycle Bin.
+        /// </summary>
+        /// <param name="nodeObjectType"></param>
+        /// <returns></returns>
+        public bool EmptyRecycleBin(Guid nodeObjectType)
+        {
+            var db = _unitOfWork.Database;
+
+            //Construct and execute delete statements for all trashed items by 'nodeObjectType'
+            var deletes = new List<string>
+                          {
+                              FormatDeleteStatement("umbracoUser2NodeNotify", "nodeId"),
+                              FormatDeleteStatement("umbracoUser2NodePermission", "nodeId"),
+                              FormatDeleteStatement("umbracoRelation", "parentId"),
+                              FormatDeleteStatement("umbracoRelation", "childId"),
+                              FormatDeleteStatement("cmsTagRelationship", "nodeId"),
+                              FormatDeleteStatement("umbracoDomains", "domainRootStructureID"),
+                              FormatDeleteStatement("cmsDocument", "NodeId"),
+                              FormatDeleteStatement("cmsPropertyData", "contentNodeId"),
+                              FormatDeleteStatement("cmsPreviewXml", "nodeId"),
+                              FormatDeleteStatement("cmsContentVersion", "ContentId"),
+                              FormatDeleteStatement("cmsContentXml", "nodeID"),
+                              FormatDeleteStatement("cmsContent", "NodeId"),
+                              "UPDATE umbracoNode SET parentID = '-20' WHERE trashed = '1' AND nodeObjectType = @NodeObjectType",
+                              "DELETE FROM umbracoNode WHERE trashed = '1' AND nodeObjectType = @NodeObjectType"
+                          };
+
+            //Wraps in transaction - this improves performance and also ensures
+            // that if any of the deletions fails that the whole thing is rolled back.
+            using (var trans = db.GetTransaction())
+            {
+                try
+                {
+                    foreach (var delete in deletes)
+                    {
+                        db.Execute(delete, new { NodeObjectType = nodeObjectType });
+                    }
+
+                    trans.Complete();
+
+                    return true;
+                }
+                catch (Exception ex)
+                {
+                    trans.Dispose();
+                    LogHelper.Error<RecycleBinRepository>("An error occurred while emptying the Recycle Bin: " + ex.Message, ex);
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Deletes all files passed in.
+        /// </summary>
+        /// <param name="files"></param>
+        /// <returns></returns>
+        public bool DeleteFiles(IEnumerable<string> files)
+        {
+            try
+            {
+                var fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+                Parallel.ForEach(files, file =>
+                                        {
+                                            if (UmbracoSettings.UploadAllowDirectories)
+                                            {
+                                                var relativeFilePath = fs.GetRelativePath(file);
+                                                var parentDirectory = System.IO.Path.GetDirectoryName(relativeFilePath);
+                                                fs.DeleteDirectory(parentDirectory, true);
+                                            }
+                                            else
+                                            {
+                                                fs.DeleteFile(file, true);
+                                            }
+                                        });
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error<RecycleBinRepository>("An error occurred while deleting files attached to deleted nodes: " + ex.Message, ex);
+                return false;
+            }
+        }
+
+        private string FormatDeleteStatement(string tableName, string keyName)
+        {
+            //This query works with sql ce and sql server:
+            //DELETE FROM umbracoUser2NodeNotify WHERE umbracoUser2NodeNotify.nodeId IN 
+            //(SELECT nodeId FROM umbracoUser2NodeNotify as TB1 INNER JOIN umbracoNode as TB2 ON TB1.nodeId = TB2.id WHERE TB2.trashed = '1' AND TB2.nodeObjectType = 'C66BA18E-EAF3-4CFF-8A22-41B16D66A972')
+            return
+                string.Format(
+                    "DELETE FROM {0} WHERE {0}.{1} IN (SELECT TB1.{1} FROM {0} as TB1 INNER JOIN umbracoNode as TB2 ON TB1.{1} = TB2.id WHERE TB2.trashed = '1' AND TB2.nodeObjectType = @NodeObjectType)",
+                    tableName, keyName);
+        }
+
+        /// <summary>
+        /// Dispose disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Ensure the unit of work is disposed
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            _unitOfWork.DisposeIfDisposable();
+        }
+    }
+}
@@ -85,11 +85,10 @@ namespace Umbraco.Core.Persistence.Repositories
        /// <returns></returns>
        public TEntity Get(TId id)
        {
-            Guid key = id is int ? ConvertIdToGuid(id) : ConvertStringIdToGuid(id.ToString());
-            var rEntity = _cache.GetById(typeof(TEntity), key);
-            if (rEntity != null)
+            var fromCache = TryGetFromCache(id);
+            if (fromCache.Success)
            {
-                return (TEntity)rEntity;
+                return fromCache.Result;
            }

            var entity = PerformGet(id);
@@ -102,7 +101,7 @@ namespace Umbraco.Core.Persistence.Repositories
            {
                //on initial construction we don't want to have dirty properties tracked
                // http://issues.umbraco.org/issue/U4-1946
-                Entity asEntity = entity as Entity;
+                TracksChangesEntityBase asEntity = entity as TracksChangesEntityBase;
                if (asEntity != null)
                {
                    asEntity.ResetDirtyProperties(false);
@@ -112,6 +111,17 @@ namespace Umbraco.Core.Persistence.Repositories
            return entity;
        }

+        protected Attempt<TEntity> TryGetFromCache(TId id)
+        {
+            Guid key = id is int ? ConvertIdToGuid(id) : ConvertStringIdToGuid(id.ToString());
+            var rEntity = _cache.GetById(typeof(TEntity), key);
+            if (rEntity != null)
+            {
+                return new Attempt<TEntity>(true, (TEntity) rEntity);
+            }
+            return Attempt<TEntity>.False;
+        } 
+
        protected abstract IEnumerable<TEntity> PerformGetAll(params TId[] ids);
        /// <summary>
        /// Gets all entities of type TEntity or a list according to the passed in Ids
@@ -173,14 +183,12 @@ namespace Umbraco.Core.Persistence.Repositories
        /// <returns></returns>
        public bool Exists(TId id)
        {
-            Guid key = id is int ? ConvertIdToGuid(id) : ConvertStringIdToGuid(id.ToString());
-            var rEntity = _cache.GetById(typeof(TEntity), key);
-            if (rEntity != null)
+            var fromCache = TryGetFromCache(id);
+            if (fromCache.Success)
            {
                return true;
            }
-
-            return PerformExists(id);
+            return PerformExists(id);            
        }

        protected abstract int PerformCount(IQuery<TEntity> query);
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    /// <summary>
+    /// Comparer that takes into account the duplicate index of a node name
+    /// This is needed as a normal alphabetic sort would go Page (1), Page (10), Page (2) etc.
+    /// </summary>
+    internal class SimilarNodeNameComparer : IComparer<string>
+    {
+        public int Compare(string x, string y)
+        {
+            if (x.LastIndexOf('(') != -1 && x.LastIndexOf(')') == x.Length - 1 && y.LastIndexOf(')') == y.Length - 1)
+            {
+                if (x.ToLower().Substring(0, x.LastIndexOf('(')) == y.ToLower().Substring(0, y.LastIndexOf('(')))
+                {
+                    int xDuplicateIndex = ExtractDuplicateIndex(x);
+                    int yDuplicateIndex = ExtractDuplicateIndex(y);
+
+                    if (xDuplicateIndex != 0 && yDuplicateIndex != 0)
+                    {
+                        return xDuplicateIndex.CompareTo(yDuplicateIndex);
+                    }
+                }
+            }
+            return String.Compare(x.ToLower(), y.ToLower(), StringComparison.Ordinal);
+        }
+
+        private int ExtractDuplicateIndex(string text)
+        {
+            int index = 0;
+
+            if (text.LastIndexOf('(') != -1 && text.LastIndexOf('(') < text.Length - 2)
+            {
+                int startPos = text.LastIndexOf('(') + 1;
+                int length = text.Length - 1 - startPos;
+
+                int.TryParse(text.Substring(startPos, length), out index);
+            }
+
+            return index;
+        }
+    }
+}
@@ -1,11 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Caching;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.Relators;
+using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;

 namespace Umbraco.Core.Persistence.Repositories
@@ -13,17 +17,17 @@ namespace Umbraco.Core.Persistence.Repositories
    /// <summary>
    /// Represents the UserRepository for doing CRUD operations for <see cref="IUser"/>
    /// </summary>
-    internal class UserRepository : PetaPocoRepositoryBase<int, IUser>, IUserRepository
+    internal class UserRepository : PermissionRepository<int, IUser>, IUserRepository
    {
        private readonly IUserTypeRepository _userTypeRepository;

-		public UserRepository(IDatabaseUnitOfWork work, IUserTypeRepository userTypeRepository)
+        public UserRepository(IDatabaseUnitOfWork work, IUserTypeRepository userTypeRepository)
            : base(work)
        {
            _userTypeRepository = userTypeRepository;
        }

-		public UserRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache, IUserTypeRepository userTypeRepository)
+        public UserRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache, IUserTypeRepository userTypeRepository)
            : base(work, cache)
        {
            _userTypeRepository = userTypeRepository;
@@ -36,7 +40,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var dto = Database.FirstOrDefault<UserDto>(sql);
+            var dto = Database.Fetch<UserDto, User2AppDto, UserDto>(new UserSectionRelator().Map, sql).FirstOrDefault();

            if (dto == null)
                return null;
@@ -52,18 +56,20 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            if (ids.Any())
            {
-                foreach (var id in ids)
-                {
-                    yield return Get(id);
-                }
+                return PerformGetAllOnIds(ids);
            }
-            else
+
+            var sql = GetBaseQuery(false);
+
+            return ConvertFromDtos(Database.Fetch<UserDto, User2AppDto, UserDto>(new UserSectionRelator().Map, sql));
+        }
+
+        private IEnumerable<IUser> PerformGetAllOnIds(params int[] ids)
+        {
+            if (ids.Any() == false) yield break;
+            foreach (var id in ids)
            {
-                var userDtos = Database.Fetch<UserDto>("WHERE id >= 0");
-                foreach (var userDto in userDtos)
-                {
-                    yield return Get(userDto.Id);
-                }
+                yield return Get(id);
            }
        }

@@ -73,7 +79,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var translator = new SqlTranslator<IUser>(sqlClause, query);
            var sql = translator.Translate();

-            var dtos = Database.Fetch<UserDto>(sql);
+            var dtos = Database.Fetch<UserDto, User2AppDto, UserDto>(new UserSectionRelator().Map, sql);

            foreach (var dto in dtos.DistinctBy(x => x.Id))
            {
@@ -88,20 +94,41 @@ namespace Umbraco.Core.Persistence.Repositories
        protected override Sql GetBaseQuery(bool isCount)
        {
            var sql = new Sql();
-            sql.Select(isCount ? "COUNT(*)" : "*")
-               .From<UserDto>();
+            if (isCount)
+            {
+                sql.Select("COUNT(*)").From<UserDto>();
+            }
+            else
+            {
+                return GetBaseQuery("*");
+            }
            return sql;
        }

+        private static Sql GetBaseQuery(string columns)
+        {
+            var sql = new Sql();
+            sql.Select(columns)
+                      .From<UserDto>()
+                      .LeftJoin<User2AppDto>()
+                      .On<UserDto, User2AppDto>(left => left.Id, right => right.UserId);
+            return sql;
+        }
+
+
        protected override string GetBaseWhereClause()
        {
            return "umbracoUser.id = @Id";
        }

        protected override IEnumerable<string> GetDeleteClauses()
-        {
+        {            
            var list = new List<string>
                           {
+                               "DELETE FROM umbracoUser2NodePermission WHERE userId = @Id",
+                               "DELETE FROM umbracoUser2NodeNotify WHERE userId = @Id",
+                               "DELETE FROM umbracoUserLogins WHERE userId = @Id",
+                               "DELETE FROM umbracoUser2app WHERE " + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("user") + "=@Id",
                               "DELETE FROM umbracoUser WHERE id = @Id"
                           };
            return list;
@@ -120,6 +147,14 @@ namespace Umbraco.Core.Persistence.Repositories
            var id = Convert.ToInt32(Database.Insert(userDto));
            entity.Id = id;

+            foreach (var sectionDto in userDto.User2AppDtos)
+            {
+                //need to set the id explicitly here
+                sectionDto.UserId = id;
+                Database.Insert(sectionDto);
+            }
+
+            ((ICanBeDirty)entity).ResetDirtyProperties();
        }

        protected override void PersistUpdatedItem(IUser entity)
@@ -128,25 +163,89 @@ namespace Umbraco.Core.Persistence.Repositories
            var userDto = userFactory.BuildDto(entity);

            Database.Update(userDto);
+
+            //update the sections if they've changed
+            var user = (User)entity;
+            if (user.IsPropertyDirty("AllowedSections"))
+            {
+                //for any that exist on the object, we need to determine if we need to update or insert
+                foreach (var sectionDto in userDto.User2AppDtos)
+                {
+                    if (user.AddedSections.Contains(sectionDto.AppAlias))
+                    {
+                        //we need to insert since this was added  
+                        Database.Insert(sectionDto);
+                    }
+                    else
+                    {
+                        //we need to manually update this record because it has a composite key
+                        Database.Update<User2AppDto>("SET app=@Section WHERE app=@Section AND " + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("user") + "=@UserId",
+                                                     new { Section = sectionDto.AppAlias, UserId = sectionDto.UserId });
+                    }
+                }
+
+                //now we need to delete any applications that have been removed
+                foreach (var section in user.RemovedSections)
+                {
+                    //we need to manually delete thsi record because it has a composite key
+                    Database.Delete<User2AppDto>("WHERE app=@Section AND " + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("user") + "=@UserId",
+                        new { Section = section, UserId = (int)user.Id });
+                }
+            }
+
+            ((ICanBeDirty)entity).ResetDirtyProperties();
        }

        #endregion

        #region Implementation of IUserRepository
-
-        public IProfile GetProfileById(int id)
+        
+        public IEnumerable<IUser> GetUsersAssignedToSection(string sectionAlias)
        {
+            //Here we're building up a query that looks like this, a sub query is required because the resulting structure
+            // needs to still contain all of the section rows per user.
+
+            //SELECT *
+            //FROM [umbracoUser]
+            //LEFT JOIN [umbracoUser2app]
+            //ON [umbracoUser].[id] = [umbracoUser2app].[user]
+            //WHERE umbracoUser.id IN (SELECT umbracoUser.id
+            //    FROM [umbracoUser]
+            //    LEFT JOIN [umbracoUser2app]
+            //    ON [umbracoUser].[id] = [umbracoUser2app].[user]
+            //    WHERE umbracoUser2app.app = 'content')
+
            var sql = GetBaseQuery(false);
-            sql.Where(GetBaseWhereClause(), new { Id = id });
+            var innerSql = GetBaseQuery("umbracoUser.id");
+            innerSql.Where("umbracoUser2app.app = " + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedValue(sectionAlias));
+            sql.Where(string.Format("umbracoUser.id IN ({0})", innerSql.SQL));

-            var dto = Database.FirstOrDefault<UserDto>(sql);
-
-            if (dto == null)
-                return null;
-
-            return new Profile(dto.Id, dto.UserName);
+            return ConvertFromDtos(Database.Fetch<UserDto, User2AppDto, UserDto>(new UserSectionRelator().Map, sql));
        }

        #endregion
+
+        private IEnumerable<IUser> ConvertFromDtos(IEnumerable<UserDto> dtos)
+        {
+            var foundUserTypes = new Dictionary<short, IUserType>();
+            return dtos.Select(dto =>
+                {
+                    //first we need to get the user type
+                    IUserType userType;
+                    if (foundUserTypes.ContainsKey(dto.Type))
+                    {
+                        userType = foundUserTypes[dto.Type];
+                    }
+                    else
+                    {
+                        userType = _userTypeRepository.Get(dto.Type);
+                        //put it in the local cache
+                        foundUserTypes.Add(dto.Type, userType);
+                    }
+
+                    var userFactory = new UserFactory(userType);
+                    return userFactory.BuildEntity(dto);
+                });
+        } 
    }
 }
@@ -32,7 +32,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var dto = Database.Query<UserTypeDto>(sql).FirstOrDefault();
+            var dto = Database.FirstOrDefault<UserTypeDto>(sql);

            if (dto == null)
                return null;
@@ -8,7 +8,7 @@ using Umbraco.Core.Persistence.UnitOfWork;

 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal abstract class VersionableRepositoryBase<TId, TEntity> : PetaPocoRepositoryBase<TId, TEntity>
+    internal abstract class VersionableRepositoryBase<TId, TEntity> : PermissionRepository<TId, TEntity>
        where TEntity : class, IAggregateRoot
    {
        protected VersionableRepositoryBase(IDatabaseUnitOfWork work) : base(work)
@@ -43,8 +43,8 @@ namespace Umbraco.Core.Persistence.Repositories

        public virtual void DeleteVersion(Guid versionId)
        {
-            var dto = Database.FirstOrDefault<ContentVersionDto>("WHERE versionId = @VersionId AND newest = @Newest", new { VersionId = versionId, Newest = false });
-            Mandate.That<Exception>(dto != null);
+            var dto = Database.FirstOrDefault<ContentVersionDto>("WHERE versionId = @VersionId", new { VersionId = versionId });
+            if(dto == null) return;

            using (var transaction = Database.GetTransaction())
            {
@@ -56,8 +56,8 @@ namespace Umbraco.Core.Persistence.Repositories

        public virtual void DeleteVersions(int id, DateTime versionDate)
        {
-            var list = Database.Fetch<ContentVersionDto>("WHERE nodeId = @Id AND VersionDate < @VersionDate", new { Id = id, VersionDate = versionDate });
-            Mandate.That<Exception>(list.Any());
+            var list = Database.Fetch<ContentVersionDto>("WHERE ContentId = @Id AND VersionDate < @VersionDate", new { Id = id, VersionDate = versionDate });
+            if (list.Any() == false) return;

            using (var transaction = Database.GetTransaction())
            {
@@ -9,41 +9,13 @@ namespace Umbraco.Core.Persistence
    /// </summary>
    public class RepositoryFactory
    {
-        
-        internal virtual ServerRegistrationRepository CreateServerRegistrationRepository(IDatabaseUnitOfWork uow)
-        {
-            return new ServerRegistrationRepository(
-                uow,
-                NullCacheProvider.Current);
-        }
-
-		internal virtual IUserTypeRepository CreateUserTypeRepository(IDatabaseUnitOfWork uow)
-        {
-            return new UserTypeRepository(
-                uow,
-                NullCacheProvider.Current);
-        }
-
-		internal virtual IUserRepository CreateUserRepository(IDatabaseUnitOfWork uow)
-        {
-            return new UserRepository(
-                uow,
-                NullCacheProvider.Current,
-                CreateUserTypeRepository(uow));
-        }
-
-        internal virtual IEntityRepository CreateEntityRepository(IDatabaseUnitOfWork uow)
-        {
-            return new EntityRepository(uow);
-        }
-
        public virtual IContentRepository CreateContentRepository(IDatabaseUnitOfWork uow)
        {
            return new ContentRepository(
                uow,
                RuntimeCacheProvider.Current,
                CreateContentTypeRepository(uow),
-                CreateTemplateRepository(uow));
+                CreateTemplateRepository(uow)) { EnsureUniqueNaming = Umbraco.Core.Configuration.UmbracoSettings.EnsureUniqueNaming };
        }

        public virtual IContentTypeRepository CreateContentTypeRepository(IDatabaseUnitOfWork uow)
@@ -81,7 +53,7 @@ namespace Umbraco.Core.Persistence
            return new MediaRepository(
                uow,
                RuntimeCacheProvider.Current,
-                CreateMediaTypeRepository(uow));
+                CreateMediaTypeRepository(uow)) { EnsureUniqueNaming = Umbraco.Core.Configuration.UmbracoSettings.EnsureUniqueNaming };
        }

        public virtual IMediaTypeRepository CreateMediaTypeRepository(IDatabaseUnitOfWork uow)
@@ -118,7 +90,39 @@ namespace Umbraco.Core.Persistence

        public virtual ITemplateRepository CreateTemplateRepository(IDatabaseUnitOfWork uow)
        {
-            return new TemplateRepository(uow, NullCacheProvider.Current);
+            return new TemplateRepository(uow, RuntimeCacheProvider.Current);
+        }
+
+        internal virtual ServerRegistrationRepository CreateServerRegistrationRepository(IDatabaseUnitOfWork uow)
+        {
+            return new ServerRegistrationRepository(
+                uow,
+                NullCacheProvider.Current);
+        }
+
+        internal virtual IUserTypeRepository CreateUserTypeRepository(IDatabaseUnitOfWork uow)
+        {
+            return new UserTypeRepository(
+                uow,
+                NullCacheProvider.Current);
+        }
+
+        internal virtual IUserRepository CreateUserRepository(IDatabaseUnitOfWork uow)
+        {
+            return new UserRepository(
+                uow,
+                NullCacheProvider.Current,
+                CreateUserTypeRepository(uow));
+        }
+
+        internal virtual IEntityRepository CreateEntityRepository(IDatabaseUnitOfWork uow)
+        {
+            return new EntityRepository(uow);
+        }
+
+        internal virtual RecycleBinRepository CreateRecycleBinRepository(IDatabaseUnitOfWork uow)
+        {
+            return new RecycleBinRepository(uow);
        }
    }
 }
--- a/Show More
+++ b/Show More