Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2

Update the install ps to do logging of copies and to actually copy the /umbraco folder properly
I was confused, these files exist just fine :)
2014-05-09 13:31:41 +02:00 · 2014-05-09 13:07:41 +02:00 · 2014-05-09 13:07:03 +02:00 · 2014-05-09 10:22:23 +02:00 · 2014-05-09 10:21:31 +02:00 · 2014-05-09 09:16:51 +02:00
2090 changed files with 111919 additions and 85355 deletions
@@ -106,3 +106,7 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
 src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
 src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
 src/Umbraco.Web.UI/umbraco/plugins/*
+src/Umbraco.Web.UI/umbraco/js/init.js
+build/ApiDocs/*
+build/ApiDocs/Output/*
+src/Umbraco.Web.UI.Client/bower_components/*
@@ -1,7 +1,11 @@
 Umbraco CMS
 ===========
-##Note: Building version 7 from source##
-If you're interested in using the source code and building version 7, make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.
+Umbraco is a free open source Content Management System built on the ASP.NET platform.
+
+## Building Umbraco from source ##
+The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt dev` in `src\Umbraco.Web.UI.Client`.
+ 
+If you're interested in making changes to Belle make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.

 ## Watch a five minute introduction video ##

@@ -0,0 +1,170 @@
+/* File    : TOC.css
+// Author  : Eric Woodruff  (Eric@EWoodruff.us)
+// Updated : 09/07/2007
+//
+// Stylesheet for the table of content
+*/
+
+*
+{
+	margin: 0px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+}
+
+body
+{
+    font-family: Segoe UI, Arial, Verdana, Helvetica, sans-serif;
+    font-size: 0.9em;
+    background-color: white;
+    color: White;
+	overflow: hidden;
+}
+
+input
+{
+	padding:5px;
+	margin: 3px 0px 3px 0px
+}
+
+img
+{
+    border: 0;
+    margin-left: 5px;
+    margin-right: 2px;
+}
+
+img.TreeNodeImg
+{
+    cursor: pointer;
+}
+
+img.TOCLink
+{
+    cursor: pointer;
+    margin-left: 0;
+    margin-right: 0;
+}
+
+a.SelectedNode, a.UnselectedNode
+{
+	color: #333;
+    text-decoration: none;
+	padding: 1px 3px 1px 3px;
+    white-space: nowrap;
+}
+
+a.SelectedNode
+{
+	background-color: #ffffff;
+    border: solid 1px #999999;
+	padding: 0px 2px 0px 2px;
+}
+
+a.UnselectedNode:hover, a.SelectedNode:hover
+{
+    background-color: #cccccc;
+    border: solid 1px #999999;
+	padding: 0px 2px 0px 2px;
+}
+
+.Visible
+{
+    display: block;
+    margin-left: 2em;
+}
+
+.Hidden
+{
+    display: none;
+}
+
+.Tree
+{
+	background-color: #fff;
+	color: #333;
+    width: 300px;
+	overflow: auto;
+}
+
+.TreeNode, .TreeItem
+{
+    white-space: nowrap;
+    margin: 2px 2px 2px 2px;
+}
+
+.TOCDiv
+{
+	position: relative;
+	float: left;
+	width: 300px;
+    height: 100%;
+}
+
+.TOCSizer
+{
+	clear: none;
+	float: left;
+	width: 10px;
+    height: 100%;    
+    background-image: url("Splitter.gif");
+    background-position:center center;
+	background-repeat:no-repeat;
+	position: relative;
+	cursor: w-resize;
+	border-left: solid 1px #CCC;
+}
+
+.TopicContent
+{
+	position: relative;
+	float: right;
+    background-color: white;
+    height: 100%;
+}
+
+.SearchOpts
+{
+    padding: 5px 5px 10px 5px;    
+    color: black;
+    width: 300px;
+	border-bottom: solid lightgrey 1px;
+	height: 110px !important;
+}
+
+.NavOpts
+{
+    padding: 5px 5px 6px 5px;    
+    color: black;
+    width: 300px;
+	border-bottom: solid lightgrey 1px;
+}
+
+.NavOpts img {
+	display:inline-block;
+	margin: 0px 5px 0px 5px;
+}
+
+.IndexOpts
+{
+    padding: 5px 5px 6px 5px;        
+    color: black;
+    width: 300px;
+	border-bottom: solid lightgrey 1px;
+}
+
+.IndexItem
+{
+    white-space: nowrap;
+    margin: 2px 2px 2px 2px;
+}
+
+.IndexSubItem
+{
+    white-space: nowrap;
+    margin: 2px 2px 2px 12px;
+}
+
+.PaddedText
+{
+    margin: 10px 10px 10px 10px;
+}
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <!-- The configuration and platform will be used to determine which
+         assemblies to include from solution and project documentation
+         sources -->
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{cb4d85f1-7390-40ee-b41f-a724bb8fddea}</ProjectGuid>
+    <SHFBSchemaVersion>1.9.5.0</SHFBSchemaVersion>
+    <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
+         Studio adds them anyway -->
+    <AssemblyName>Documentation</AssemblyName>
+    <RootNamespace>Documentation</RootNamespace>
+    <Name>Documentation</Name>
+    <!-- SHFB properties -->
+    <FrameworkVersion>.NET Framework 4.5</FrameworkVersion>
+    <OutputPath>.\Output\</OutputPath>
+    <HtmlHelpName>UmbracoClassLibrary</HtmlHelpName>
+    <Language>en-US</Language>
+    <BuildAssemblerVerbosity>OnlyErrors</BuildAssemblerVerbosity>
+    <BuildLogFile>csharp-api-docs.log</BuildLogFile>
+    <HelpFileFormat>Website</HelpFileFormat>
+    <IndentHtml>True</IndentHtml>
+    <KeepLogFile>False</KeepLogFile>
+    <DisableCodeBlockComponent>False</DisableCodeBlockComponent>
+    <CppCommentsFixup>False</CppCommentsFixup>
+    <CleanIntermediates>True</CleanIntermediates>
+    <SyntaxFilters>CSharp</SyntaxFilters>
+    <SdkLinkTarget>Blank</SdkLinkTarget>
+    <RootNamespaceContainer>False</RootNamespaceContainer>
+    <PresentationStyle>VS2010</PresentationStyle>
+    <Preliminary>False</Preliminary>
+    <NamingMethod>Guid</NamingMethod>
+    <HelpTitle>Umbraco .Net Class Library</HelpTitle>
+    <ContentPlacement>AboveNamespaces</ContentPlacement>
+    <VisibleItems>Attributes, InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
+    <ComponentConfigurations />
+    <DocumentationSources>
+      <DocumentationSource sourceFile="..\..\src\Umbraco.Core\Umbraco.Core.csproj" />
+<DocumentationSource sourceFile="..\..\src\Umbraco.Core\bin\Release\Umbraco.Core.xml" />
+<DocumentationSource sourceFile="..\..\src\Umbraco.Web\Umbraco.Web.csproj" />
+<DocumentationSource sourceFile="..\..\src\Umbraco.Web\bin\Release\umbraco.xml" /></DocumentationSources>
+    <WebsiteSdkLinkType>None</WebsiteSdkLinkType>
+    <HtmlSdkLinkType>None</HtmlSdkLinkType>
+    <IncludeFavorites>False</IncludeFavorites>
+    <BinaryTOC>True</BinaryTOC>
+    <MissingTags>Summary, AutoDocumentCtors, AutoDocumentDispose</MissingTags>
+    <TransformComponentArguments>
+      <Argument Key="logoFile" Value="" />
+      <Argument Key="logoHeight" Value="" />
+      <Argument Key="logoWidth" Value="" />
+      <Argument Key="logoAltText" Value="" />
+      <Argument Key="logoPlacement" Value="left" />
+      <Argument Key="logoAlignment" Value="left" />
+    </TransformComponentArguments>
+    <ApiFilter>
+      <Filter entryType="Namespace" fullName="CookComputing.Blogger" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="CookComputing.MetaWeblog" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="dashboardUtilities" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="presentation.umbraco.webservices" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco" isExposed="False" xmlns="">
+  <Filter entryType="Class" fullName="umbraco.content" filterName="content" isExposed="True" />
+  <Filter entryType="Delegate" fullName="umbraco.content.ContentCacheDatabaseLoadXmlStringEventHandler" filterName="content.ContentCacheDatabaseLoadXmlStringEventHandler" isExposed="False" />
+  <Filter entryType="Delegate" fullName="umbraco.content.ContentCacheLoadNodeEventHandler" filterName="content.ContentCacheLoadNodeEventHandler" isExposed="False" />
+  <Filter entryType="Delegate" fullName="umbraco.content.DocumentCacheEventHandler" filterName="content.DocumentCacheEventHandler" isExposed="False" />
+  <Filter entryType="Delegate" fullName="umbraco.content.RefreshContentEventHandler" filterName="content.RefreshContentEventHandler" isExposed="False" />
+  <Filter entryType="Class" fullName="umbraco.ContentExtensions" filterName="ContentExtensions" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.ContentTypeExtensions" filterName="ContentTypeExtensions" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.item" filterName="item" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.library" filterName="library" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.macro" filterName="macro" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.MacroCacheContent" filterName="MacroCacheContent" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.MacroRenderingEventArgs" filterName="MacroRenderingEventArgs" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.MediaExtensions" filterName="MediaExtensions" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.MemberExtensions" filterName="MemberExtensions" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.page" filterName="page" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.PreValueExtensions" filterName="PreValueExtensions" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.RelationTypeExtensions" filterName="RelationTypeExtensions" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.template" filterName="template" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.UmbracoObjectTypeExtensions" filterName="UmbracoObjectTypeExtensions" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.uQuery" filterName="uQuery" isExposed="True" />
+  <Filter entryType="Interface" fullName="umbraco.uQuery.IGetProperty" filterName="uQuery.IGetProperty" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.uQuery.Members" filterName="uQuery.Members" isExposed="True" />
+  <Filter entryType="Enumeration" fullName="umbraco.uQuery.UmbracoObjectType" filterName="uQuery.UmbracoObjectType" isExposed="True" />
+</Filter>
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.create.controls" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer.RelationTypes" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer.RelationTypes.TreeMenu" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.members" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.modal" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.scripts" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.stylesheet" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.cms.presentation.user" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.controls" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.controls.GenericProperties" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.controls.Images" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.controls.Tree" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.developer" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.dialogs" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.js" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.layoutControls" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.NodeFactory" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.actions" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.channels" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.channels.businesslogic" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.create" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.developer.packages" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.dialogs" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.masterpages" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.members" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.nodeFactory" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.org.umbraco.update" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.plugins.tinymce3" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.preview" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.Search" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.settings" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.templateControls" isExposed="False" xmlns="">
+  <Filter entryType="Class" fullName="umbraco.presentation.templateControls.Item" filterName="Item" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.presentation.templateControls.ItemRenderer" filterName="ItemRenderer" isExposed="True" />
+  <Filter entryType="Class" fullName="umbraco.presentation.templateControls.Macro" filterName="Macro" isExposed="True" />
+  <Filter entryType="Enumeration" fullName="umbraco.presentation.templateControls.Macro.RenderEvents" filterName="Macro.RenderEvents" isExposed="False" />
+</Filter>
+<Filter entryType="Namespace" fullName="umbraco.presentation.tinymce3" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.translation" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.channels" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.controls" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.create" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.developer.Xslt" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.dialogs" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.masterpages" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.members" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.plugins.tinymce3" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.Search" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.translation" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.webservices" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.urlRewriter" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.Web.UI" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.presentation.webservices" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.scripting" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.settings" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="Umbraco.Web.org.umbraco.our" isExposed="False" xmlns="" />
+<Filter entryType="Namespace" fullName="umbraco.webservices" isExposed="False" xmlns="" /></ApiFilter>
+  </PropertyGroup>
+  <!-- There are no properties for these groups.  AnyCPU needs to appear in
+       order for Visual Studio to perform the build.  The others are optional
+       common platform types that may appear. -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
+  </PropertyGroup>
+  <!-- Import the SHFB build targets -->
+  <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
+</Project>
@@ -1,19 +1,28 @@
@ECHO OFF
-SET release=7.0.0
-SET comment=RC
+SET release=7.1.2
+SET comment=
 SET version=%release%

 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
+ECHO Building Umbraco %version%

 ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%

+ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise you'd have to run build.cmd twice
+SET nuGetFolder=%CD%\..\src\packages\
+..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
+
+ECHO Removing the belle build folder to make sure everything is clean as a whistle
+RD ..\src\Umbraco.Web.UI.Client\build /Q /S
+
+ECHO Performing MSBuild and producing Umbraco binaries zip files
 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%

+ECHO Adding dummy files to include in the NuGet package so that empty folders actually get created
 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
 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_Data\dummy.txt
 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_Plugins\dummy.txt
 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\css\dummy.txt
-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\macroScripts\dummy.txt
 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\masterpages\dummy.txt
 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\media\dummy.txt
 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\scripts\dummy.txt
@@ -21,9 +30,15 @@ echo This file is only here so that the containing folder will be included in th
 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\Views\Partials\dummy.txt
 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\Views\MacroPartials\dummy.txt

-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
+ECHO Adding Web.config transform files to the NuGet package
+ren .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
+ren .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
+ren .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform

+ECHO Packing the NuGet release files
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version%
+                        
 IF ERRORLEVEL 1 GOTO :showerror

 GOTO :EOF
@@ -267,7 +267,7 @@
    <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
    <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
    <!-- Build the Umbraco.Web.UI project -->
-    <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+    <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
    </MSBuild>
    
    <!-- DONE -->
@@ -310,7 +310,12 @@
  </Target>

  <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
-    <!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
+	<PropertyGroup>
+		<NewVersion>$(BUILD_RELEASE)</NewVersion>
+		<NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
+	</PropertyGroup>
+	
+	<!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
    <FileUpdate
      Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
      Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?"
@@ -319,5 +324,10 @@
    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
      Regex="CurrentComment { get { return &quot;([a-zA-Z]+)?&quot;"
      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>
+	
+	<XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.targets"
+             Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
+			 Query="//x:UmbracoVersion"
+			 Value="$(NewVersion)" />
  </Target>
 </Project>
@@ -0,0 +1,35 @@
+@ECHO OFF
+ECHO Installing Npm NuGet Package
+
+SET nuGetFolder=%CD%\..\src\packages\
+ECHO Configured packages folder: %nuGetFolder%
+ECHO Current folder: %CD%
+
+%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%
+
+for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
+for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
+
+ECHO Temporarily adding Npm and Node to path
+SET oldPath=%PATH%
+
+path=%npmPath%;%nodePath%;%PATH%
+
+ECHO %path%
+
+SET buildFolder=%CD%
+
+ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
+CD %CD%\..\src\Umbraco.Web.UI.Client\
+
+ECHO Do npm install and the grunt build of Belle
+call npm install
+call npm install -g grunt-cli
+call npm install -g bower
+call grunt build --buildversion=7.1.2
+
+ECHO Reset path to what it was before
+path=%oldPath%
+
+ECHO Move back to the build folder
+CD %buildFolder% 
@@ -0,0 +1,27 @@
+##We cannot continue if sandcastle is not installed determined by env variable: SHFBROOT
+
+if (-not (Test-Path Env:\SHFBROOT))
+{
+	throw "The docs cannot be build, install Sandcastle help file builder"
+}
+
+$PSScriptFilePath = (Get-Item $MyInvocation.MyCommand.Path).FullName
+$BuildRoot = Split-Path -Path $PSScriptFilePath -Parent
+$OutputPath = Join-Path -Path $BuildRoot -ChildPath "ApiDocs\Output"
+$ProjFile = Join-Path -Path $BuildRoot -ChildPath "ApiDocs\csharp-api-docs.shfbproj"
+
+"Building docs with project file:  $ProjFile"
+
+$MSBuild = "$Env:SYSTEMROOT\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+# build it!
+& $MSBuild "$ProjFile"
+
+# remove files left over
+Remove-Item $BuildRoot\* -include csharp-api-docs.shfbproj_*
+
+# copy our custom styles in
+Copy-Item $BuildRoot\ApiDocs\TOC.css $OutputPath\TOC.css
+
+""
+"Done!"
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>UmbracoCms.Core.AllBinaries</id>
+        <version>6.1.2</version>
+        <title>Umbraco Cms Core All Binaries</title>
+        <authors>Morten Christensen</authors>
+        <owners>Umbraco HQ</owners>
+        <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+        <projectUrl>http://umbraco.com/</projectUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+        <summary>Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+    </metadata>
+    <files>
+        <file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
+		<file src="..\_BuildOutput\bin\AutoMapper.dll" target="lib\AutoMapper.dll" />
+        <file src="..\_BuildOutput\bin\AutoMapper.Net4.dll" target="lib\AutoMapper.Net4.dll" />
+        <file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
+        <file src="..\_BuildOutput\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
+        <file src="..\_BuildOutput\bin\ClientDependency.Core.Mvc.dll" target="lib\ClientDependency.Core.Mvc.dll" />
+        <file src="..\_BuildOutput\bin\cms.dll" target="lib\cms.dll" />
+        <file src="..\_BuildOutput\bin\controls.dll" target="lib\controls.dll" />
+        <file src="..\_BuildOutput\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
+        <file src="..\_BuildOutput\bin\Examine.dll" target="lib\Examine.dll" />
+        <file src="..\_BuildOutput\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
+        <file src="..\_BuildOutput\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
+        <file src="..\_BuildOutput\bin\ImageProcessor.dll" target="lib\ImageProcessor.dll" />
+        <file src="..\_BuildOutput\bin\ImageProcessor.Web.dll" target="lib\ImageProcessor.Web.dll" />
+        <file src="..\_BuildOutput\bin\interfaces.dll" target="lib\interfaces.dll" />
+        <file src="..\_BuildOutput\bin\log4net.dll" target="lib\log4net.dll" />
+        <file src="..\_BuildOutput\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.dll" target="lib\Microsoft.Threading.Tasks.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.Extensions.dll" target="lib\Microsoft.Threading.Tasks.Extensions.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Web.Infrastructure.dll" target="lib\Microsoft.Web.Infrastructure.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Web.Mvc.FixedDisplayModes.dll" target="lib\Microsoft.Web.Mvc.FixedDisplayModes.dll" />
+        <file src="..\_BuildOutput\bin\MiniProfiler.dll" target="lib\MiniProfiler.dll" />
+        <file src="..\_BuildOutput\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
+        <file src="..\_BuildOutput\bin\Newtonsoft.Json.dll" target="lib\Newtonsoft.Json.dll" />
+        <file src="..\_BuildOutput\bin\NuGet.Core.dll" target="lib\NuGet.Core.dll" />
+        <file src="..\_BuildOutput\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
+        <file src="..\_BuildOutput\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
+        <file src="..\_BuildOutput\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.dll" target="lib\System.Net.Http.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.Extensions.dll" target="lib\System.Net.Http.Extensions.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.Formatting.dll" target="lib\System.Net.Http.Formatting.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.Primitives.dll" target="lib\System.Net.Http.Primitives.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.WebRequest.dll" target="lib\System.Net.Http.WebRequest.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Helpers.dll" target="lib\System.Web.Helpers.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Http.dll" target="lib\System.Web.Http.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Http.WebHost.dll" target="lib\System.Web.Http.WebHost.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Mvc.dll" target="lib\System.Web.Mvc.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Razor.dll" target="lib\System.Web.Razor.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.WebPages.Administration.dll" target="lib\System.Web.WebPages.Administration.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.WebPages.Deployment.dll" target="lib\System.Web.WebPages.Deployment.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.WebPages.dll" target="lib\System.Web.WebPages.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.WebPages.Razor.dll" target="lib\System.Web.WebPages.Razor.dll" />
+        <file src="..\_BuildOutput\bin\TidyNet.dll" target="lib\TidyNet.dll" />
+        <file src="..\_BuildOutput\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.dll" target="lib\umbraco.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
+        <file src="..\_BuildOutput\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
+        <file src="..\_BuildOutput\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
+        <file src="..\_BuildOutput\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
+    </files>
+</package>
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>UmbracoCms.Core</id>
+        <version>7.0.0</version>
+        <title>Umbraco Cms Core Binaries</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+        <projectUrl>http://umbraco.com/</projectUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+    </metadata>
+    <files>
+        <file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.dll" target="lib" />
+        <file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.pdb" target="lib" />
+		<file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
+		
+		<file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.dll" target="lib" />
+		<file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.pdb" target="lib" />
+		<file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
+		
+        <file src="..\..\src\umbraco.cms\obj\Debug\cms.dll" target="lib" />
+        <file src="..\..\src\umbraco.cms\obj\Debug\cms.pdb" target="lib" />
+		<file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
+		
+        <file src="..\..\src\umbraco.controls\obj\Debug\controls.dll" target="lib" />
+        <file src="..\..\src\umbraco.controls\obj\Debug\controls.pdb" target="lib" />
+		<file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
+		
+        <file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.dll" target="lib" />
+        <file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.pdb" target="lib" />
+		<file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
+        
+		<file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.dll" target="lib" />
+		<file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.pdb" target="lib" />
+		<file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
+		
+        <file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.dll" target="lib" />
+        <file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.pdb" target="lib" />
+		<file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
+		
+        <file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.dll" target="lib" />
+        <file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.pdb" target="lib" />
+		<file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
+		
+        <file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.dll" target="lib" />
+        <file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.pdb" target="lib" />
+		<file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
+				
+        <file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.dll" target="lib" />
+        <file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.pdb" target="lib" />
+		<file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
+		
+        <file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.dll" target="lib" />
+        <file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.pdb" target="lib" />
+		<file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
+		
+        <file src="..\..\src\bin\Debug\Umbraco.Web.UI.dll" target="lib" />
+        <file src="..\..\src\bin\Debug\Umbraco.Web.UI.pdb" target="lib" />
+		<file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
+				
+        <file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.dll" target="lib" />
+        <file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.pdb" target="lib" />
+		<file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />		
+    </files>
+</package>
@@ -4,7 +4,7 @@
        <id>UmbracoCms.Core</id>
        <version>7.0.0</version>
        <title>Umbraco Cms Core Binaries</title>
-        <authors>Morten Christensen</authors>
+        <authors>Umbraco HQ</authors>
        <owners>Umbraco HQ</owners>
        <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
        <projectUrl>http://umbraco.com/</projectUrl>
@@ -15,19 +15,23 @@
        <language>en-US</language>
        <tags>umbraco</tags>
        <dependencies>
-            <dependency id="Microsoft.AspNet.Mvc" version="4.0" />
-            <dependency id="Microsoft.AspNet.WebApi" version="4.0" />
+            <dependency id="Microsoft.AspNet.Mvc" version="[4.0.0,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi" version="[4.0.30506,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.Client" version="[4.0.30506, 5.0.0)" />
            <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
+            <dependency id="Microsoft.Net.Http" version="[2.0.0, 3.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)" />
+            <dependency id="ClientDependency" version="[1.7.1.2, 2.0.0)" />
+            <dependency id="ClientDependency-Mvc" version="[1.7.0.4, 2.0.0)" />
            <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
-            <dependency id="Newtonsoft.Json" version="[5.0.0, 6.0.0)" />
+            <dependency id="Newtonsoft.Json" version="[6.0.2, 7.0.0)" />
+            <dependency id="ImageProcessor" version="[1.9.0, 2.0.0)" />
+            <dependency id="ImageProcessor.Web" version="[3.2.3, 4.0.0)" />
        </dependencies>
    </metadata>
    <files>
@@ -43,9 +47,6 @@
        <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" />
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
+    <metadata minClientVersion="2.8">
        <id>UmbracoCms</id>
        <version>7.0.0</version>
        <title>Umbraco Cms</title>
-        <authors>Morten Christensen</authors>
+        <authors>Umbraco HQ</authors>
        <owners>Umbraco HQ</owners>
        <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
        <projectUrl>http://umbraco.com/</projectUrl>
@@ -19,11 +19,9 @@
        </dependencies>
    </metadata>
  <files>
-	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="Content\bin\amd64" />
-	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
 	<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\macroScripts\**" target="Content\macroScripts" exclude="..\_BuildOutput\WebApp\macroScripts\Web.config" />
 	<file src="..\_BuildOutput\WebApp\masterpages\**" target="Content\masterpages" />
 	<file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
 	<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
@@ -32,15 +30,14 @@
 	<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" />
+	<file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
 	<file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-	<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\App_Plugins\**" target="UmbracoFiles\App_Plugins" />	
+	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
+	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
 	<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" />
-	<file src="..\_BuildOutput\WebApp\Global.asax" target="UmbracoFiles\Global.asax" />
 	<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" />
@@ -1,14 +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>
+<?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,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UmbracoVersion>7.1.2</UmbracoVersion>
+  </PropertyGroup>
+  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
+    <PropertyGroup>
+      <UmbracoFilesFolder>..\packages\UmbracoCms.$(UmbracoVersion)\UmbracoFiles\</UmbracoFilesFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+  <Target Name="AddUmbracoFilesToOutput">
+    <!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
+    <ItemGroup>
+      <CustomFilesToInclude Include=".\App_Browsers\**\*">
+        <Dir>App_Browsers</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\App_Code\**\*">
+        <Dir>App_Code</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\App_Plugins\**\*">
+        <Dir>App_Plugins</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\bin\amd64\**\*">
+        <Dir>bin\amd64</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\bin\x86\**\*">
+        <Dir>bin\x86</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\Config\Splashes\**\*">
+        <Dir>Config\Splashes</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\umbraco\**\*">
+        <Dir>umbraco</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\umbraco_client\**\*">
+        <Dir>umbraco_client</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\Global.asax">
+        <Dir>.</Dir>
+      </CustomFilesToInclude>
+      <FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
+        <DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
+</Project>
@@ -1,19 +0,0 @@
-<?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,14 +0,0 @@
-<?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>
@@ -1,19 +0,0 @@
-<?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,14 +0,0 @@
-<?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>
@@ -1,19 +0,0 @@
-<?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,8 +1,17 @@
 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. 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.
+When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
+file (and config files in the config folder). 
+We will overwrite Web.config anyway but we keep a backup in the App_Data\NuGetBackup folder. There you'll 
+find a folder with the current date and time in which the backup has been placed. Make sure to merge the 
+new file with the old backup files before you proceed.
+The web.config will be overwritten by default to ensure that it has the necessary settings from the current release. 
+
+We've also overwritten all the files in the Umbraco and Umbraco_Client folder, these have also been backed up in 
+App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or a package
+might have added. Only the existing files were overwritten. If you customized anything then make sure to do a compare 
+and merge with the NuGetBackup folder.
+
 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).
@@ -10,8 +19,8 @@ copied over (as a minimum).
 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.
+These things will now be automatically included when creating a deploy package or publishing to the file system:
+umbraco, umbraco_client, config\splashes and global.asax.

 Please read the release notes on our.umbraco.org:
 http://our.umbraco.org/contribute/releases
@@ -1,33 +1,48 @@
 param($rootPath, $toolsPath, $package, $project)

-if ($project) {	
-	# Create a backup of extisting umbraco config files
-	$configPath = Join-Path (Split-Path $project.FullName -Parent) "\config"
-    $backupPath = Join-Path $configPath "\backup"
-	Get-ChildItem -path $configPath |
-	   Where -filterscript {($_.Name.EndsWith("config"))} | Foreach-Object {
-	    $newFileName = Join-Path $backupPath $_.Name.replace(".config",".config.backup")
-        New-Item -ItemType File -Path $newFileName -Force
-	    Copy-Item $_.FullName $newFileName -Force
-	   }
-		
+if ($project) {
+	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
+	$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
 	# Create a backup of original web.config
 	$projectDestinationPath = Split-Path $project.FullName -Parent
-	$webConfigSource = Join-Path $projectDestinationPath "web.config"
-	$webConfigDestination = Join-Path $projectDestinationPath "web.config.backup"
-	Copy-Item $webConfigSource $webConfigDestination
-	
-	# Copy umbraco files from package to project folder
-	$projectDestinationPath = Split-Path $project.FullName -Parent
-	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
-	Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
-	
-	# Remove Newtonsoft.Json if present in the bin folder
-	# If we don't do this, the correct version never gets copied in
-	$projectDestinationPath = Split-Path $project.FullName -Parent
-	$jsonDllFile = Join-Path $projectDestinationPath "bin\Newtonsoft.Json.dll"
-	Remove-Item $jsonDllFile -Confirm:$false
+	$webConfigSource = Join-Path $projectDestinationPath "Web.config"
+	Copy-Item $webConfigSource $backupPath -Force
 	
+	# Copy Web.config from package to project folder
+	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\Web.config"
+	Copy-Item $umbracoFilesPath $projectDestinationPath -Force
+
+	# Copy umbraco and umbraco_files from package to project folder
+	# This is only done when these folders already exist because we 
+	# only want to do this for upgrades
+	$umbracoFolder = Join-Path $projectDestinationPath "Umbraco"
+	if(Test-Path $umbracoFolder) {
+		$umbracoFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco"
+		
+		$umbracoBackupPath = Join-Path $backupPath "Umbraco"
+		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
+		
+		robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
+		robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
+	}
+
+	$umbracoClientFolder = Join-Path $projectDestinationPath "Umbraco_Client"	
+	if(Test-Path $umbracoClientFolder) {
+		$umbracoClientFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco_Client"
+		
+		$umbracoClientBackupPath = Join-Path $backupPath "Umbraco_Client"
+		New-Item -ItemType Directory -Force -Path $umbracoClientBackupPath
+		
+		robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
+		robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
+	}
+
 	# Open readme.txt file
 	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
 }
@@ -18,13 +18,13 @@
    
    <ItemGroup Condition=" '$(PackageSources)' == '' ">
        <!-- 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 -->
+        <!-- The official NuGet package source (https://www.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://www.nuget.org/api/v2/" />
            <PackageSource Include="https://my-nuget-source/nuget/" />
        -->
      <PackageSource Include="https://nuget.org/api/v2/" />
-      <PackageSource Include="http://www.myget.org/F/umbracocore/" />
+      <PackageSource Include="http://www.myget.org/F/umbracocore/" />		
    </ItemGroup>

    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
@@ -41,7 +41,7 @@
    
    <PropertyGroup>
        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
        
        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
@@ -50,9 +50,14 @@
        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
        
        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+        
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>

        <!-- We need to ensure packages are restored prior to assembly resolve -->
        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
@@ -70,7 +75,6 @@
    <Target Name="CheckPrerequisites">
        <!-- Raise an error if we're unable to locate nuget.exe  -->
        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
        <!--
        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
        This effectively acts as a lock that makes sure that the download operation will only happen once and all
@@ -119,7 +123,7 @@

                    Log.LogMessage("Downloading latest version of NuGet.exe...");
                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);

                    return true;
                }
@@ -131,23 +135,4 @@
            </Code>
        </Task>
    </UsingTask>
-    
-     <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <EnvKey ParameterType="System.String" Required="true" />
-            <EnvValue ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Using Namespace="System" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
-                }
-                catch  {
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
 </Project>
@@ -42,6 +42,13 @@ namespace SqlCE4Umbraco
            {
                var sqlCeEngine = new SqlCeEngine(ConnectionString);
                sqlCeEngine.CreateDatabase();
+
+                // SD: Pretty sure this should be in a using clause but i don't want to cause unknown side-effects here
+                // since it's been like this for quite some time
+                //using (var sqlCeEngine = new SqlCeEngine(ConnectionString))
+                //{
+                //    sqlCeEngine.CreateDatabase();    
+                //}
            }
        }

@@ -165,6 +165,9 @@ namespace Umbraco.Core
        /// </remarks>
        internal string OriginalRequestUrl { get; set; }

+        /// <summary>
+        /// Checks if the version configured matches the assembly version
+        /// </summary>
 		private bool Configured
 		{
 			get
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;

 namespace Umbraco.Core
@@ -1,164 +1,174 @@
-using System;
-using Umbraco.Core.Dynamics;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Represents the result of an operation attempt.
-    /// </summary>
-    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-    [Serializable]
-	public struct Attempt<T>
-	{
-		private readonly bool _success;
-		private readonly T _result;
-		private readonly Exception _exception;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
-        /// </summary>
-        public bool Success
-		{
-			get { return _success; }
-		}
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        public Exception Exception { get { return _exception; } }
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
-        public Exception Error { get { return _exception; } }
-
-        /// <summary>
-        /// Gets the attempt result.
-        /// </summary>
-        public T Result
-		{
-			get { return _result; }
-		}
-
-        // optimize, use a singleton failed attempt
-		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
-
-        /// <summary>
-        /// Represents an unsuccessful attempt.
-        /// </summary>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
-        public static readonly Attempt<T> False = Failed; 
-
-        // private - use Succeed() or Fail() methods to create attempts
-        private Attempt(bool success, T result, Exception exception)
-        {
-            _success = success;
-            _result = result;
-            _exception = exception;
-        }
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
-        /// </summary>
-        /// <param name="success">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
-        public Attempt(bool success, T result)
-            : this(success, result, null)
-        { }
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
-        public Attempt(Exception exception)
-            : this(false, default(T), exception)
-        { }
-
-        /// <summary>
-        /// Creates a successful attempt.
-        /// </summary>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed()
-        {
-            return new Attempt<T>(true, default(T), null);
-        }
-
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed(T result)
-        {
-            return new Attempt<T>(true, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt.
-        /// </summary>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail()
-        {
-            return Failed;
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(Exception exception)
-        {
-            return new Attempt<T>(false, default(T), exception);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(T result)
-        {
-            return new Attempt<T>(false, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(T result, Exception exception)
-        {
-            return new Attempt<T>(false, result, exception);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> SucceedIf(bool condition)
-        {
-            return condition ? new Attempt<T>(true, default(T), null) : Failed;
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> SucceedIf(bool condition, T result)
-        {
-            return new Attempt<T>(condition, result, null);
-        }
-    }
+using System;
+using Umbraco.Core.Dynamics;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Represents the result of an operation attempt.
+    /// </summary>
+    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+    [Serializable]
+	public struct Attempt<T>
+	{
+		private readonly bool _success;
+		private readonly T _result;
+		private readonly Exception _exception;
+
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
+        /// </summary>
+        public bool Success
+		{
+			get { return _success; }
+		}
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        public Exception Exception { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
+        public Exception Error { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the attempt result.
+        /// </summary>
+        public T Result
+		{
+			get { return _result; }
+		}
+
+        // optimize, use a singleton failed attempt
+		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
+
+        /// <summary>
+        /// Represents an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
+        public static readonly Attempt<T> False = Failed; 
+
+        // private - use Succeed() or Fail() methods to create attempts
+        private Attempt(bool success, T result, Exception exception)
+        {
+            _success = success;
+            _result = result;
+            _exception = exception;
+        }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
+        /// </summary>
+        /// <param name="success">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(bool success, T result)
+            : this(success, result, null)
+        { }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(Exception exception)
+            : this(false, default(T), exception)
+        { }
+
+        /// <summary>
+        /// Creates a successful attempt.
+        /// </summary>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed()
+        {
+            return new Attempt<T>(true, default(T), null);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed(T result)
+        {
+            return new Attempt<T>(true, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail()
+        {
+            return Failed;
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(Exception exception)
+        {
+            return new Attempt<T>(false, default(T), exception);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result)
+        {
+            return new Attempt<T>(false, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result, Exception exception)
+        {
+            return new Attempt<T>(false, result, exception);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition)
+        {
+            return condition ? new Attempt<T>(true, default(T), null) : Failed;
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition, T result)
+        {
+            return new Attempt<T>(condition, result, null);
+        }
+
+        /// <summary>
+        /// Implicity operator to check if the attempt was successful without having to access the 'success' property
+        /// </summary>
+        /// <param name="a"></param>
+        /// <returns></returns>
+        public static implicit operator bool(Attempt<T> a)
+        {
+            return a.Success;
+        }
+    }
 }
@@ -1,3 +1,5 @@
+using System;
+
 namespace Umbraco.Core.Cache
 {

@@ -9,6 +11,7 @@ namespace Umbraco.Core.Cache
        public const string ApplicationTreeCacheKey = "ApplicationTreeCache";
        public const string ApplicationsCacheKey = "ApplicationCache";

+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
        public const string UserTypeCacheKey = "UserTypeCache";

        public const string ContentItemCacheKey = "contentItem";
@@ -24,13 +27,16 @@ namespace Umbraco.Core.Cache

        public const string MemberLibraryCacheKey = "UL_GetMember";
        public const string MemberBusinessLogicCacheKey = "MemberCacheItem_";
-
+        
        public const string TemplateFrontEndCacheKey = "template";
        public const string TemplateBusinessLogicCacheKey = "UmbracoTemplateCache";

        public const string UserContextCacheKey = "UmbracoUserContext";
        public const string UserContextTimeoutCacheKey = "UmbracoUserContextTimeout";
+
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
        public const string UserCacheKey = "UmbracoUser";
+        
        public const string UserPermissionsCacheKey = "UmbracoUserPermissions";

        public const string ContentTypeCacheKey = "UmbracoContentType";
@@ -47,5 +53,6 @@ namespace Umbraco.Core.Cache
        public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty";

        public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
+        public const string DataTypePreValuesCacheKey = "UmbracoPreVal";
    }
 }
@@ -41,6 +41,12 @@ namespace Umbraco.Core.Cache
            return result.Select(x => x.TryConvertTo<T>().Result);
        }

+        public static IEnumerable<T> GetCacheItemsByKeyExpression<T>(this ICacheProvider provider, string regexString)
+        {
+            var result = provider.GetCacheItemsByKeyExpression(regexString);
+            return result.Select(x => x.TryConvertTo<T>().Result);
+        }
+
        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
        {
            var result = provider.GetCacheItem(cacheKey);
@@ -6,7 +6,7 @@ using System.Threading;

 namespace Umbraco.Core.Cache
 {
-    internal abstract class DictionaryCacheProdiverBase : ICacheProvider
+    internal abstract class DictionaryCacheProviderBase : ICacheProvider
    {
        protected static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
        protected abstract DictionaryCacheWrapper DictionaryCache { get; }
@@ -171,6 +171,26 @@ namespace Umbraco.Core.Cache
                    select c.Value).ToList();
        }

+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            var found = new List<object>();
+            foreach (var item in DictionaryCache)
+            {
+                var c = new DictionaryItemWrapper(item);
+                var s = c.Key as string;
+                if (s != null)
+                {
+                    var withoutPrefix = s.TrimStart(string.Format("{0}-", CacheItemPrefix));
+                    if (Regex.IsMatch(withoutPrefix, regexString))
+                    {
+                        found.Add(c.Value);
+                    }
+                }
+            }
+
+            return found;
+        }
+
        /// <summary>
        /// Returns a cache item by key, does not update the cache if it isn't there.
        /// </summary>
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// A cache provider that caches items in the HttpContext.Items
    /// </summary>
-    internal class HttpRequestCacheProvider : DictionaryCacheProdiverBase
+    internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
    {
        private readonly Func<HttpContextBase> _context;

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// A CacheProvider that wraps the logic of the HttpRuntime.Cache
    /// </summary>
-    internal class HttpRuntimeCacheProvider : DictionaryCacheProdiverBase, IRuntimeCacheProvider
+    internal class HttpRuntimeCacheProvider : DictionaryCacheProviderBase, IRuntimeCacheProvider
    {
        private readonly System.Web.Caching.Cache _cache;
        private readonly DictionaryCacheWrapper _wrapper;
@@ -16,7 +16,15 @@ namespace Umbraco.Core.Cache
        void ClearCacheByKeySearch(string keyStartsWith);
        void ClearCacheByKeyExpression(string regexString);
        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
+        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
+        
+        /// <summary>
+        /// Returns an item with a given key
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
        object GetCacheItem(string cacheKey);
+
        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
    }
 }
@@ -43,6 +43,11 @@ namespace Umbraco.Core.Cache
            return Enumerable.Empty<object>();
        }

+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return Enumerable.Empty<object>();
+        }
+
        public virtual object GetCacheItem(string cacheKey)
        {
            return default(object);
@@ -114,6 +114,13 @@ namespace Umbraco.Core.Cache
                    select c.Value).ToList();
        }

+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return (from c in MemoryCache
+                    where Regex.IsMatch(c.Key, regexString)
+                    select c.Value).ToList();
+        }
+
        public virtual object GetCacheItem(string cacheKey)
        {
            var result = MemoryCache.Get(cacheKey);
@@ -59,6 +59,13 @@ namespace Umbraco.Core.Cache
                    select c.Value).ToList();
        }

+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return (from KeyValuePair<string, object> c in StaticCache
+                    where Regex.IsMatch(c.Key, regexString) 
+                    select c.Value).ToList();
+        }
+
        public virtual object GetCacheItem(string cacheKey)
        {
            var result = StaticCache[cacheKey];
@@ -27,7 +27,7 @@ namespace Umbraco.Core
 		/// <summary>
 		/// Gets the <see cref="ICacheRefresher"/> implementations.
 		/// </summary>
-		public IEnumerable<ICacheRefresher> CacheResolvers
+		public IEnumerable<ICacheRefresher> CacheRefreshers
 		{
 			get
 			{
@@ -1,38 +1,38 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-
-    internal class BaseRestSection : UmbracoConfigurationSection, IBaseRestSection
-    {
-        private const string KeyEnabled = "enabled";
-
-        private bool? _enabled;
-        
-        [ConfigurationProperty("", IsKey = false, IsRequired = false, IsDefaultCollection = true)]
-		public ExtensionElementCollection Items
-		{
-			get { return (ExtensionElementCollection)base[""]; }
-		}
-
-        /// <summary>
-        /// Gets or sets a value indicating whether base rest extensions are enabled.
-        /// </summary>
-        [ConfigurationProperty(KeyEnabled, DefaultValue = true, IsRequired = false)]
-        public bool Enabled
-        {
-            get
-            {
-                return _enabled ?? (IsPresent == false || (bool)this[KeyEnabled]);
-            }
-            internal set { _enabled = value; }
-        }
-
-        IExtensionsCollection IBaseRestSection.Items
-        {
-            get { return Items; }
-        }
-
-    }
-}
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+
+    internal class BaseRestSection : UmbracoConfigurationSection, IBaseRestSection
+    {
+        private const string KeyEnabled = "enabled";
+
+        private bool? _enabled;
+        
+        [ConfigurationProperty("", IsKey = false, IsRequired = false, IsDefaultCollection = true)]
+		public ExtensionElementCollection Items
+		{
+			get { return (ExtensionElementCollection)base[""]; }
+		}
+
+        /// <summary>
+        /// Gets or sets a value indicating whether base rest extensions are enabled.
+        /// </summary>
+        [ConfigurationProperty(KeyEnabled, DefaultValue = true, IsRequired = false)]
+        public bool Enabled
+        {
+            get
+            {
+                return _enabled ?? (IsPresent == false || (bool)this[KeyEnabled]);
+            }
+            internal set { _enabled = value; }
+        }
+
+        IExtensionsCollection IBaseRestSection.Items
+        {
+            get { return Items; }
+        }
+
+    }
+}
@@ -1,81 +1,81 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-
-    [ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
-    internal class ExtensionElement : ConfigurationElementCollection, IEnumerable<IMethodSection>, IExtension
-    {
-		const string KeyAlias = "alias";
-		const string KeyType = "type";
-		const string KeyMethod = "method";
-
-		[ConfigurationProperty(KeyAlias, IsKey = true, IsRequired = true)]
-		public string Alias
-		{
-			get { return (string)base[KeyAlias]; }
-		}
-
-		[ConfigurationProperty(KeyType, IsKey = false, IsRequired = true)]
-		public string Type
-		{
-			get { return (string)base[KeyType]; }
-		}
-
-		public override ConfigurationElementCollectionType CollectionType
-		{
-			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
-		}
-
-		protected override string ElementName
-		{
-			get { return KeyMethod; }
-		}
-
-		protected override bool IsElementName(string elementName)
-		{
-			return elementName.Equals(KeyMethod, StringComparison.InvariantCultureIgnoreCase);
-		}
-
-		protected override ConfigurationElement CreateNewElement()
-		{
-			return new MethodElement();
-		}
-
-		protected override object GetElementKey(ConfigurationElement element)
-		{
-			return ((MethodElement)element).Name;
-		}
-
-		public override bool IsReadOnly()
-		{
-			return false;
-		}
-
-		new public MethodElement this[string index]
-		{
-			get { return (MethodElement)BaseGet(index); }
-		}
-
-        IEnumerator<IMethodSection> IEnumerable<IMethodSection>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IMethodSection;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        IMethodSection IExtension.this[string index]
-        {
-            get { return this[index]; }
-        }
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+
+    [ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
+    internal class ExtensionElement : ConfigurationElementCollection, IEnumerable<IMethodSection>, IExtension
+    {
+		const string KeyAlias = "alias";
+		const string KeyType = "type";
+		const string KeyMethod = "method";
+
+		[ConfigurationProperty(KeyAlias, IsKey = true, IsRequired = true)]
+		public string Alias
+		{
+			get { return (string)base[KeyAlias]; }
+		}
+
+		[ConfigurationProperty(KeyType, IsKey = false, IsRequired = true)]
+		public string Type
+		{
+			get { return (string)base[KeyType]; }
+		}
+
+		public override ConfigurationElementCollectionType CollectionType
+		{
+			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
+		}
+
+		protected override string ElementName
+		{
+			get { return KeyMethod; }
+		}
+
+		protected override bool IsElementName(string elementName)
+		{
+			return elementName.Equals(KeyMethod, StringComparison.InvariantCultureIgnoreCase);
+		}
+
+		protected override ConfigurationElement CreateNewElement()
+		{
+			return new MethodElement();
+		}
+
+		protected override object GetElementKey(ConfigurationElement element)
+		{
+			return ((MethodElement)element).Name;
+		}
+
+		public override bool IsReadOnly()
+		{
+			return false;
+		}
+
+		new public MethodElement this[string index]
+		{
+			get { return (MethodElement)BaseGet(index); }
+		}
+
+        IEnumerator<IMethodSection> IEnumerable<IMethodSection>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IMethodSection;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IMethodSection IExtension.this[string index]
+        {
+            get { return this[index]; }
+        }
+
+    }
+}
@@ -1,70 +1,70 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IExtensionsCollection : IEnumerable<IExtension>
-    {
-        IExtension this[string index] { get; }
-    }
-
-	[ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
-    internal class ExtensionElementCollection : ConfigurationElementCollection, IExtensionsCollection
-	{
-		const string KeyExtension = "extension";
-
-		public override ConfigurationElementCollectionType CollectionType
-		{
-			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
-		}
-
-		protected override string ElementName
-		{
-			get { return KeyExtension; }
-		}
-
-		protected override bool IsElementName(string elementName)
-		{
-			return elementName.Equals(KeyExtension, StringComparison.InvariantCultureIgnoreCase);
-		}
-
-		protected override ConfigurationElement CreateNewElement()
-		{
-			return new ExtensionElement();
-		}
-
-		protected override object GetElementKey(ConfigurationElement element)
-		{
-			return ((ExtensionElement)element).Alias;
-		}
-
-		public override bool IsReadOnly()
-		{
-			return false;
-		}
-
-		new public ExtensionElement this[string index]
-		{
-			get { return (ExtensionElement)BaseGet(index); }
-		}
-
-        IEnumerator<IExtension> IEnumerable<IExtension>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IExtension;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        IExtension IExtensionsCollection.this[string index]
-        {
-            get { return this[index]; }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IExtensionsCollection : IEnumerable<IExtension>
+    {
+        IExtension this[string index] { get; }
+    }
+
+	[ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
+    internal class ExtensionElementCollection : ConfigurationElementCollection, IExtensionsCollection
+	{
+		const string KeyExtension = "extension";
+
+		public override ConfigurationElementCollectionType CollectionType
+		{
+			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
+		}
+
+		protected override string ElementName
+		{
+			get { return KeyExtension; }
+		}
+
+		protected override bool IsElementName(string elementName)
+		{
+			return elementName.Equals(KeyExtension, StringComparison.InvariantCultureIgnoreCase);
+		}
+
+		protected override ConfigurationElement CreateNewElement()
+		{
+			return new ExtensionElement();
+		}
+
+		protected override object GetElementKey(ConfigurationElement element)
+		{
+			return ((ExtensionElement)element).Alias;
+		}
+
+		public override bool IsReadOnly()
+		{
+			return false;
+		}
+
+		new public ExtensionElement this[string index]
+		{
+			get { return (ExtensionElement)BaseGet(index); }
+		}
+
+        IEnumerator<IExtension> IEnumerable<IExtension>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IExtension;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IExtension IExtensionsCollection.this[string index]
+        {
+            get { return this[index]; }
+        }
+    }
+}
@@ -1,14 +1,14 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IBaseRestSection
-    {
-        IExtensionsCollection Items { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether base rest extensions are enabled.
-        /// </summary>
-        bool Enabled { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IBaseRestSection
+    {
+        IExtensionsCollection Items { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether base rest extensions are enabled.
+        /// </summary>
+        bool Enabled { get; }
+    }
 }
@@ -1,11 +1,11 @@
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IExtension
-    {
-        string Alias { get; }
-
-        string Type { get; }
-
-        IMethodSection this[string index] { get; }
-    }
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IExtension
+    {
+        string Alias { get; }
+
+        string Type { get; }
+
+        IMethodSection this[string index] { get; }
+    }
 }
@@ -1,17 +1,17 @@
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IMethodSection
-    {
-        string Name { get; }
-
-        bool AllowAll { get; }
-
-        string AllowGroup { get; }
-
-        string AllowType { get; }
-
-        string AllowMember { get; }
-
-        bool ReturnXml { get; }
-    }
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IMethodSection
+    {
+        string Name { get; }
+
+        bool AllowAll { get; }
+
+        string AllowGroup { get; }
+
+        string AllowType { get; }
+
+        string AllowMember { get; }
+
+        bool ReturnXml { get; }
+    }
 }
@@ -1,50 +1,50 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    internal class MethodElement : ConfigurationElement, IMethodSection
-    {
-		const string KeyName = "name";
-		const string KeyAllowAll = "allowAll";
-		const string KeyAllowGroup = "allowGroup";
-		const string KeyAllowType = "allowType";
-		const string KeyAllowMember = "allowMember";
-		const string KeyReturnXml = "returnXml";
-
-		[ConfigurationProperty(KeyName, IsKey = true, IsRequired = true)]
-		public string Name
-		{
-			get { return (string)base[KeyName]; }
-		}
-
-		[ConfigurationProperty(KeyAllowAll, IsKey = false, IsRequired = false, DefaultValue = false)]
-		public bool AllowAll
-		{
-			get { return (bool)base[KeyAllowAll]; }
-		}
-
-		[ConfigurationProperty(KeyAllowGroup, IsKey = false, IsRequired = false, DefaultValue = null)]
-		public string AllowGroup
-		{
-			get { return (string)base[KeyAllowGroup]; }
-		}
-
-		[ConfigurationProperty(KeyAllowType, IsKey = false, IsRequired = false, DefaultValue = null)]
-		public string AllowType
-		{
-			get { return (string)base[KeyAllowType]; }
-		}
-
-		[ConfigurationProperty(KeyAllowMember, IsKey = false, IsRequired = false, DefaultValue = null)]
-		public string AllowMember
-		{
-			get { return (string)base[KeyAllowMember]; }
-		}
-
-		[ConfigurationProperty(KeyReturnXml, IsKey = false, IsRequired = false, DefaultValue = true)]
-		public bool ReturnXml
-		{
-			get { return (bool)base[KeyReturnXml]; }
-		}
-	}
-}
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    internal class MethodElement : ConfigurationElement, IMethodSection
+    {
+		const string KeyName = "name";
+		const string KeyAllowAll = "allowAll";
+		const string KeyAllowGroup = "allowGroup";
+		const string KeyAllowType = "allowType";
+		const string KeyAllowMember = "allowMember";
+		const string KeyReturnXml = "returnXml";
+
+		[ConfigurationProperty(KeyName, IsKey = true, IsRequired = true)]
+		public string Name
+		{
+			get { return (string)base[KeyName]; }
+		}
+
+		[ConfigurationProperty(KeyAllowAll, IsKey = false, IsRequired = false, DefaultValue = false)]
+		public bool AllowAll
+		{
+			get { return (bool)base[KeyAllowAll]; }
+		}
+
+		[ConfigurationProperty(KeyAllowGroup, IsKey = false, IsRequired = false, DefaultValue = null)]
+		public string AllowGroup
+		{
+			get { return (string)base[KeyAllowGroup]; }
+		}
+
+		[ConfigurationProperty(KeyAllowType, IsKey = false, IsRequired = false, DefaultValue = null)]
+		public string AllowType
+		{
+			get { return (string)base[KeyAllowType]; }
+		}
+
+		[ConfigurationProperty(KeyAllowMember, IsKey = false, IsRequired = false, DefaultValue = null)]
+		public string AllowMember
+		{
+			get { return (string)base[KeyAllowMember]; }
+		}
+
+		[ConfigurationProperty(KeyReturnXml, IsKey = false, IsRequired = false, DefaultValue = true)]
+		public bool ReturnXml
+		{
+			get { return (bool)base[KeyReturnXml]; }
+		}
+	}
+}
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Configuration
        }

        /// <summary>
-        /// Increases the version number in ClientDependency.config by 1
+        /// Changes the version number in ClientDependency.config to a random value to avoid stale caches
        /// </summary>
        internal bool IncreaseVersionNumber()
        {
@@ -28,9 +28,9 @@ namespace Umbraco.Core.Configuration

                    var versionAttribute = clientDependencyConfigXml.Root.Attribute("version");

-                    int oldVersion;
-                    int.TryParse(versionAttribute.Value, out oldVersion);
-                    var newVersion = oldVersion + 1;
+                    //Set the new version to the hashcode of now
+                    var oldVersion = versionAttribute.Value;
+                    var newVersion = Math.Abs(DateTime.UtcNow.GetHashCode());

                    versionAttribute.SetValue(newVersion);
                    clientDependencyConfigXml.Save(_fileName, SaveOptions.DisableFormatting);
@@ -1,70 +1,70 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// Defines a configuration section that contains inner text that is comma delimited
-    /// </summary>
-    internal class CommaDelimitedConfigurationElement : InnerTextConfigurationElement<CommaDelimitedStringCollection>, IEnumerable<string>
-    {
-        public override CommaDelimitedStringCollection Value
-        {
-            get 
-            { 
-                var converter = new CommaDelimitedStringCollectionConverter();
-                return (CommaDelimitedStringCollection) converter.ConvertFrom(RawValue);
-            }
-        }
-
-        IEnumerator<string> IEnumerable<string>.GetEnumerator()
-        {
-            return new InnerEnumerator(Value.GetEnumerator());
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return new InnerEnumerator(Value.GetEnumerator());
-        }
-
-        /// <summary>
-        /// A wrapper for StringEnumerator since it doesn't explicitly implement IEnumerable
-        /// </summary>
-        private class InnerEnumerator : IEnumerator<string>
-        {
-            private readonly StringEnumerator _stringEnumerator;
-
-            public InnerEnumerator(StringEnumerator stringEnumerator)
-            {
-                _stringEnumerator = stringEnumerator;
-            }
-
-            public bool MoveNext()
-            {
-                return _stringEnumerator.MoveNext();
-            }
-
-            public void Reset()
-            {
-                _stringEnumerator.Reset();
-            }
-
-            string IEnumerator<string>.Current
-            {
-                get { return _stringEnumerator.Current; }
-            }
-
-            public object Current
-            {
-                get { return _stringEnumerator.Current; }
-            }
-
-            public void Dispose()
-            {
-                ObjectExtensions.DisposeIfDisposable(_stringEnumerator);
-            }
-        }
-    }
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// Defines a configuration section that contains inner text that is comma delimited
+    /// </summary>
+    internal class CommaDelimitedConfigurationElement : InnerTextConfigurationElement<CommaDelimitedStringCollection>, IEnumerable<string>
+    {
+        public override CommaDelimitedStringCollection Value
+        {
+            get 
+            { 
+                var converter = new CommaDelimitedStringCollectionConverter();
+                return (CommaDelimitedStringCollection) converter.ConvertFrom(RawValue);
+            }
+        }
+
+        IEnumerator<string> IEnumerable<string>.GetEnumerator()
+        {
+            return new InnerEnumerator(Value.GetEnumerator());
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return new InnerEnumerator(Value.GetEnumerator());
+        }
+
+        /// <summary>
+        /// A wrapper for StringEnumerator since it doesn't explicitly implement IEnumerable
+        /// </summary>
+        private class InnerEnumerator : IEnumerator<string>
+        {
+            private readonly StringEnumerator _stringEnumerator;
+
+            public InnerEnumerator(StringEnumerator stringEnumerator)
+            {
+                _stringEnumerator = stringEnumerator;
+            }
+
+            public bool MoveNext()
+            {
+                return _stringEnumerator.MoveNext();
+            }
+
+            public void Reset()
+            {
+                _stringEnumerator.Reset();
+            }
+
+            string IEnumerator<string>.Current
+            {
+                get { return _stringEnumerator.Current; }
+            }
+
+            public object Current
+            {
+                get { return _stringEnumerator.Current; }
+            }
+
+            public void Dispose()
+            {
+                ObjectExtensions.DisposeIfDisposable(_stringEnumerator);
+            }
+        }
+    }
 }
@@ -1,34 +1,34 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AccessElement : RawXmlConfigurationElement, IAccess
-    {
-        public AccessElement()
-        {
-            
-        }
-
-        public AccessElement(XElement rawXml)
-            :base(rawXml)
-        {
-        }
-
-        public IEnumerable<IAccessItem> Rules
-        {
-            get
-            {
-                var result = new List<AccessItem>();
-                if (RawXml != null)
-                {
-                    result.AddRange(RawXml.Elements("deny").Select(x => new AccessItem {Action = AccessType.Deny, Value = x.Value }));
-                    result.AddRange(RawXml.Elements("grant").Select(x => new AccessItem { Action = AccessType.Grant, Value = x.Value }));
-                    result.AddRange(RawXml.Elements("grantBySection").Select(x => new AccessItem { Action = AccessType.GrantBySection, Value = x.Value }));
-                }
-                return result;
-            }
-        }
-    }
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AccessElement : RawXmlConfigurationElement, IAccess
+    {
+        public AccessElement()
+        {
+            
+        }
+
+        public AccessElement(XElement rawXml)
+            :base(rawXml)
+        {
+        }
+
+        public IEnumerable<IAccessItem> Rules
+        {
+            get
+            {
+                var result = new List<AccessItem>();
+                if (RawXml != null)
+                {
+                    result.AddRange(RawXml.Elements("deny").Select(x => new AccessItem {Action = AccessType.Deny, Value = x.Value }));
+                    result.AddRange(RawXml.Elements("grant").Select(x => new AccessItem { Action = AccessType.Grant, Value = x.Value }));
+                    result.AddRange(RawXml.Elements("grantBySection").Select(x => new AccessItem { Action = AccessType.GrantBySection, Value = x.Value }));
+                }
+                return result;
+            }
+        }
+    }
 }
@@ -1,15 +1,15 @@
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AccessItem : IAccessItem
-    {
-        /// <summary>
-        /// This can be grant, deny or grantBySection
-        /// </summary>
-        public AccessType Action { get; set; }
-        
-        /// <summary>
-        /// The value of the action
-        /// </summary>
-        public string Value { get; set; }
-    }
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AccessItem : IAccessItem
+    {
+        /// <summary>
+        /// This can be grant, deny or grantBySection
+        /// </summary>
+        public AccessType Action { get; set; }
+        
+        /// <summary>
+        /// The value of the action
+        /// </summary>
+        public string Value { get; set; }
+    }
 }
@@ -1,9 +1,9 @@
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public enum AccessType
-    {
-        Grant,
-        Deny,
-        GrantBySection
-    }
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public enum AccessType
+    {
+        Grant,
+        Deny,
+        GrantBySection
+    }
 }
@@ -1,32 +1,32 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AreaCollection : ConfigurationElementCollection, IEnumerable<IArea>
-    {
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new AreaElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((AreaElement) element).Value;
-        }
-
-        IEnumerator<IArea> IEnumerable<IArea>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IArea;
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreaCollection : ConfigurationElementCollection, IEnumerable<IArea>
+    {
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new AreaElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((AreaElement) element).Value;
+        }
+
+        IEnumerator<IArea> IEnumerable<IArea>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IArea;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
 }
@@ -1,12 +1,12 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AreaElement : InnerTextConfigurationElement<string>, IArea
-    {
-        string IArea.AreaName
-        {
-            get { return Value; }
-        }
-    }
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreaElement : InnerTextConfigurationElement<string>, IArea
+    {
+        string IArea.AreaName
+        {
+            get { return Value; }
+        }
+    }
 }
@@ -1,15 +1,15 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AreasElement : ConfigurationElement
-    {
-        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "area")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public AreaCollection AreaCollection
-        {
-            get { return (AreaCollection)base[""]; }
-            set { base[""] = value; }
-        }
-    }
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreasElement : ConfigurationElement
+    {
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "area")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public AreaCollection AreaCollection
+        {
+            get { return (AreaCollection)base[""]; }
+            set { base[""] = value; }
+        }
+    }
 }
@@ -1,37 +1,37 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class ControlCollection : ConfigurationElementCollection, IEnumerable<IDashboardControl>
-    {
-        internal void Add(ControlElement c)
-        {
-            BaseAdd(c);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new ControlElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((ControlElement)element).ControlPath;
-        }
-
-        IEnumerator<IDashboardControl> IEnumerable<IDashboardControl>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IDashboardControl;
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class ControlCollection : ConfigurationElementCollection, IEnumerable<IDashboardControl>
+    {
+        internal void Add(ControlElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new ControlElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((ControlElement)element).ControlPath;
+        }
+
+        IEnumerator<IDashboardControl> IEnumerable<IDashboardControl>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IDashboardControl;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
 }
@@ -1,74 +1,74 @@
-using System;
-using System.Configuration;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    
-    internal class ControlElement : RawXmlConfigurationElement, IDashboardControl
-    {
-        public bool ShowOnce
-        {
-            get
-            {
-                return RawXml.Attribute("showOnce") == null
-                           ? false
-                           : bool.Parse(RawXml.Attribute("showOnce").Value);
-            }
-        }
-
-        public bool AddPanel
-        {
-            get
-            {
-                return RawXml.Attribute("addPanel") == null
-                           ? true
-                           : bool.Parse(RawXml.Attribute("addPanel").Value);
-            }
-        }
-
-        public string PanelCaption
-        {
-            get
-            {
-                return RawXml.Attribute("panelCaption") == null
-                           ? ""
-                           : RawXml.Attribute("panelCaption").Value;
-            }
-        }
-
-        public AccessElement Access
-        {
-            get
-            {
-                var access = RawXml.Element("access");
-                if (access == null)
-                {
-                    return new AccessElement();
-                }
-                return new AccessElement(access);
-            }
-        }
-
-        public string ControlPath 
-        { 
-            get
-            {
-                //we need to return the first (and only) text element of the children (wtf... who designed this configuration ! :P )
-                var txt = RawXml.Nodes().OfType<XText>().FirstOrDefault();
-                if (txt == null)
-                {
-                    throw new ConfigurationErrorsException("The control element must contain a text node indicating the control path");
-                }
-                return txt.Value.Trim();
-            }
-        }
-
-
-        IAccess IDashboardControl.AccessRights
-        {
-            get { return Access; }
-        }
-    }
+using System;
+using System.Configuration;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    
+    internal class ControlElement : RawXmlConfigurationElement, IDashboardControl
+    {
+        public bool ShowOnce
+        {
+            get
+            {
+                return RawXml.Attribute("showOnce") == null
+                           ? false
+                           : bool.Parse(RawXml.Attribute("showOnce").Value);
+            }
+        }
+
+        public bool AddPanel
+        {
+            get
+            {
+                return RawXml.Attribute("addPanel") == null
+                           ? true
+                           : bool.Parse(RawXml.Attribute("addPanel").Value);
+            }
+        }
+
+        public string PanelCaption
+        {
+            get
+            {
+                return RawXml.Attribute("panelCaption") == null
+                           ? ""
+                           : RawXml.Attribute("panelCaption").Value;
+            }
+        }
+
+        public AccessElement Access
+        {
+            get
+            {
+                var access = RawXml.Element("access");
+                if (access == null)
+                {
+                    return new AccessElement();
+                }
+                return new AccessElement(access);
+            }
+        }
+
+        public string ControlPath 
+        { 
+            get
+            {
+                //we need to return the first (and only) text element of the children (wtf... who designed this configuration ! :P )
+                var txt = RawXml.Nodes().OfType<XText>().FirstOrDefault();
+                if (txt == null)
+                {
+                    throw new ConfigurationErrorsException("The control element must contain a text node indicating the control path");
+                }
+                return txt.Value.Trim();
+            }
+        }
+
+
+        IAccess IDashboardControl.AccessRights
+        {
+            get { return Access; }
+        }
+    }
 }
@@ -1,24 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class DashboardSection : ConfigurationSection, IDashboardSection
-    {
-        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "section")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public SectionCollection SectionCollection
-        {
-            get { return (SectionCollection)base[""]; }
-            set { base[""] = value; }
-        }
-
-        IEnumerable<ISection> IDashboardSection.Sections
-        {
-            get { return SectionCollection; }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class DashboardSection : ConfigurationSection, IDashboardSection
+    {
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "section")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public SectionCollection SectionCollection
+        {
+            get { return (SectionCollection)base[""]; }
+            set { base[""] = value; }
+        }
+
+        IEnumerable<ISection> IDashboardSection.Sections
+        {
+            get { return SectionCollection; }
+        }
+    }
+}
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IAccess
-    {
-        IEnumerable<IAccessItem> Rules { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IAccess
+    {
+        IEnumerable<IAccessItem> Rules { get; }
+    }
 }
@@ -1,15 +1,15 @@
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IAccessItem
-    {
-        /// <summary>
-        /// This can be grant, deny or grantBySection
-        /// </summary>
-        AccessType Action { get; set; }
-
-        /// <summary>
-        /// The value of the action
-        /// </summary>
-        string Value { get; set; }
-    }
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IAccessItem
+    {
+        /// <summary>
+        /// This can be grant, deny or grantBySection
+        /// </summary>
+        AccessType Action { get; set; }
+
+        /// <summary>
+        /// The value of the action
+        /// </summary>
+        string Value { get; set; }
+    }
 }
@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IArea
-    {
-        string AreaName { get; }
-    }
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IArea
+    {
+        string AreaName { get; }
+    }
 }
@@ -1,15 +1,15 @@
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IDashboardControl
-    {
-        bool ShowOnce { get; }
-
-        bool AddPanel { get; }
-
-        string PanelCaption { get; }
-
-        string ControlPath { get; }
-
-        IAccess AccessRights { get; }
-    }
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardControl
+    {
+        bool ShowOnce { get; }
+
+        bool AddPanel { get; }
+
+        string PanelCaption { get; }
+
+        string ControlPath { get; }
+
+        IAccess AccessRights { get; }
+    }
 }
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IDashboardSection
-    {
-        IEnumerable<ISection> Sections { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardSection
+    {
+        IEnumerable<ISection> Sections { get; }
+    }
 }
@@ -1,13 +1,13 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IDashboardTab
-    {
-        string Caption { get; }
-
-        IEnumerable<IDashboardControl> Controls { get; }
-
-        IAccess AccessRights { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardTab
+    {
+        string Caption { get; }
+
+        IEnumerable<IDashboardControl> Controls { get; }
+
+        IAccess AccessRights { get; }
+    }
 }
@@ -1,15 +1,15 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface ISection
-    {
-        string Alias { get; }
-
-        IEnumerable<string> Areas { get; }
-
-        IEnumerable<IDashboardTab> Tabs { get; }
-
-        IAccess AccessRights { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface ISection
+    {
+        string Alias { get; }
+
+        IEnumerable<string> Areas { get; }
+
+        IEnumerable<IDashboardTab> Tabs { get; }
+
+        IAccess AccessRights { get; }
+    }
 }
@@ -1,37 +1,37 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class SectionCollection : ConfigurationElementCollection, IEnumerable<ISection>
-    {
-        internal void Add(SectionElement c)
-        {
-            BaseAdd(c);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new SectionElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((SectionElement)element).Alias;
-        }
-
-        IEnumerator<ISection> IEnumerable<ISection>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as ISection;
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class SectionCollection : ConfigurationElementCollection, IEnumerable<ISection>
+    {
+        internal void Add(SectionElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new SectionElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((SectionElement)element).Alias;
+        }
+
+        IEnumerator<ISection> IEnumerable<ISection>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as ISection;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
 }
@@ -1,50 +1,50 @@
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class SectionElement : ConfigurationElement, ISection
-    {
-        [ConfigurationProperty("alias", IsRequired = true)]
-        public string Alias
-        {
-            get { return (string) this["alias"]; }
-        }
-
-        [ConfigurationProperty("areas", IsRequired = true)]
-        public AreasElement Areas
-        {
-            get { return (AreasElement)this["areas"]; }
-        }
-        
-        [ConfigurationProperty("access")]
-        public AccessElement Access
-        {
-            get { return (AccessElement)this["access"]; }
-        }
-
-        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "tab")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public TabCollection TabCollection
-        {
-            get { return (TabCollection)base[""]; }
-            set { base[""] = value; }
-        }
-
-        IEnumerable<IDashboardTab> ISection.Tabs
-        {
-            get { return TabCollection; }            
-        }
-
-        IEnumerable<string> ISection.Areas
-        {
-            get { return Areas.AreaCollection.Cast<AreaElement>().Select(x => x.Value); }
-        }
-
-        IAccess ISection.AccessRights
-        {
-            get { return Access; }
-        }
-    }
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class SectionElement : ConfigurationElement, ISection
+    {
+        [ConfigurationProperty("alias", IsRequired = true)]
+        public string Alias
+        {
+            get { return (string) this["alias"]; }
+        }
+
+        [ConfigurationProperty("areas", IsRequired = true)]
+        public AreasElement Areas
+        {
+            get { return (AreasElement)this["areas"]; }
+        }
+        
+        [ConfigurationProperty("access")]
+        public AccessElement Access
+        {
+            get { return (AccessElement)this["access"]; }
+        }
+
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "tab")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public TabCollection TabCollection
+        {
+            get { return (TabCollection)base[""]; }
+            set { base[""] = value; }
+        }
+
+        IEnumerable<IDashboardTab> ISection.Tabs
+        {
+            get { return TabCollection; }            
+        }
+
+        IEnumerable<string> ISection.Areas
+        {
+            get { return Areas.AreaCollection.Cast<AreaElement>().Select(x => x.Value); }
+        }
+
+        IAccess ISection.AccessRights
+        {
+            get { return Access; }
+        }
+    }
 }
@@ -1,37 +1,37 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class TabCollection : ConfigurationElementCollection, IEnumerable<IDashboardTab>
-    {
-        internal void Add(TabElement c)
-        {
-            BaseAdd(c);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new TabElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((TabElement)element).Caption;
-        }
-
-        IEnumerator<IDashboardTab> IEnumerable<IDashboardTab>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IDashboardTab;
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class TabCollection : ConfigurationElementCollection, IEnumerable<IDashboardTab>
+    {
+        internal void Add(TabElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new TabElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((TabElement)element).Caption;
+        }
+
+        IEnumerator<IDashboardTab> IEnumerable<IDashboardTab>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IDashboardTab;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
 }
@@ -1,38 +1,38 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class TabElement : ConfigurationElement, IDashboardTab
-    {
-        [ConfigurationProperty("caption", IsRequired = true)]
-        public string Caption
-        {
-            get { return (string)this["caption"]; }
-        }
-        
-        [ConfigurationProperty("access")]
-        public AccessElement Access
-        {
-            get { return (AccessElement)this["access"]; }
-        }
-
-        [ConfigurationCollection(typeof(ControlCollection), AddItemName = "control")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public ControlCollection ControlCollection
-        {
-            get { return (ControlCollection)base[""]; }
-            set { base[""] = value; }
-        }
-        
-        IEnumerable<IDashboardControl> IDashboardTab.Controls
-        {
-            get { return ControlCollection; }            
-        }
-
-        IAccess IDashboardTab.AccessRights
-        {
-            get { return Access; }
-        }
-    }
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class TabElement : ConfigurationElement, IDashboardTab
+    {
+        [ConfigurationProperty("caption", IsRequired = true)]
+        public string Caption
+        {
+            get { return (string)this["caption"]; }
+        }
+        
+        [ConfigurationProperty("access")]
+        public AccessElement Access
+        {
+            get { return (AccessElement)this["access"]; }
+        }
+
+        [ConfigurationCollection(typeof(ControlCollection), AddItemName = "control")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public ControlCollection ControlCollection
+        {
+            get { return (ControlCollection)base[""]; }
+            set { base[""] = value; }
+        }
+        
+        IEnumerable<IDashboardControl> IDashboardTab.Controls
+        {
+            get { return ControlCollection; }            
+        }
+
+        IAccess IDashboardTab.AccessRights
+        {
+            get { return Access; }
+        }
+    }
 }
@@ -6,10 +6,13 @@ using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Web.Routing;
+using System.Web.Security;
 using System.Xml;
 using System.Xml.Linq;
+using System.Xml.XPath;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Security;

 namespace Umbraco.Core.Configuration
 {
@@ -38,7 +41,7 @@ namespace Umbraco.Core.Configuration
        private static string _reservedUrls;
        //ensure the built on (non-changeable) reserved paths are there at all times
        private const string StaticReservedPaths = "~/app_plugins/,~/install/,";
-        private const string StaticReservedUrls = "~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,";
+        private const string StaticReservedUrls = "~/config/splashes/booting.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,";

        #endregion

@@ -259,7 +262,38 @@ namespace Umbraco.Core.Configuration
                SaveSetting("umbracoConfigurationStatus", value);
            }
        }
-
+        
+        /// <summary>
+        /// Gets or sets the Umbraco members membership providers' useLegacyEncoding state. This will return a boolean
+        /// </summary>
+        /// <value>The useLegacyEncoding status.</value>
+        public static bool UmbracoMembershipProviderLegacyEncoding
+        {
+            get
+            {
+                return IsConfiguredMembershipProviderUsingLegacyEncoding(Constants.Conventions.Member.UmbracoMemberProviderName);
+            }
+            set
+            {
+                SetMembershipProvidersLegacyEncoding(Constants.Conventions.Member.UmbracoMemberProviderName, value);
+            }
+        }
+        
+        /// <summary>
+        /// Gets or sets the Umbraco users membership providers' useLegacyEncoding state. This will return a boolean
+        /// </summary>
+        /// <value>The useLegacyEncoding status.</value>
+        public static bool UmbracoUsersMembershipProviderLegacyEncoding
+        {
+            get
+            {
+                return IsConfiguredMembershipProviderUsingLegacyEncoding(UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider);
+            }
+            set
+            {
+                SetMembershipProvidersLegacyEncoding(UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider, value);
+            }
+        }
 		
        /// <summary>
        /// Saves a setting into the configuration file.
@@ -268,7 +302,7 @@ namespace Umbraco.Core.Configuration
        /// <param name="value">Value of the setting to be saved.</param>
        internal static void SaveSetting(string key, string value)
        {
-            var fileName = IOHelper.MapPath(string.Format("{0}/appSettings.config", SystemDirectories.Config));
+            var fileName = IOHelper.MapPath(string.Format("{0}/web.config", SystemDirectories.Root));
            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);

            var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
@@ -290,7 +324,7 @@ namespace Umbraco.Core.Configuration
        /// <param name="key">Key of the setting to be removed.</param>
        internal static void RemoveSetting(string key)
        {
-            var fileName = IOHelper.MapPath(string.Format("{0}/appSettings.config", SystemDirectories.Config));
+            var fileName = IOHelper.MapPath(string.Format("{0}/web.config", SystemDirectories.Root));
            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);

            var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
@@ -301,7 +335,51 @@ namespace Umbraco.Core.Configuration
                setting.Remove();
                xml.Save(fileName, SaveOptions.DisableFormatting);
                ConfigurationManager.RefreshSection("appSettings");
+            }        
+        }
+
+        private static void SetMembershipProvidersLegacyEncoding(string providerName, bool useLegacyEncoding)
+        {
+            //check if this can even be configured.
+            var membershipProvider = Membership.Providers[providerName] as MembershipProviderBase;
+            if (membershipProvider == null)
+            {
+                return;
            }
+            if (membershipProvider.GetType().Namespace == "umbraco.providers.members")
+            {
+                //its the legacy one, this cannot be changed
+                return;
+            }
+
+            var webConfigFilename = IOHelper.MapPath(string.Format("{0}/web.config", SystemDirectories.Root));
+            var webConfigXml = XDocument.Load(webConfigFilename, LoadOptions.PreserveWhitespace);
+
+            var membershipConfigs = webConfigXml.XPathSelectElements("configuration/system.web/membership/providers/add").ToList();
+
+            if (membershipConfigs.Any() == false) 
+                return;
+
+            var provider = membershipConfigs.SingleOrDefault(c => c.Attribute("name") != null && c.Attribute("name").Value == providerName);
+
+            if (provider == null) 
+                return;
+
+            provider.SetAttributeValue("useLegacyEncoding", useLegacyEncoding);
+            
+            webConfigXml.Save(webConfigFilename, SaveOptions.DisableFormatting);
+        }
+
+        private static bool IsConfiguredMembershipProviderUsingLegacyEncoding(string providerName)
+        {
+            //check if this can even be configured.
+            var membershipProvider = Membership.Providers[providerName] as MembershipProviderBase;
+            if (membershipProvider == null)
+            {
+                return false;
+            }
+
+            return membershipProvider.UseLegacyEncoding;            
        }

        /// <summary>
@@ -697,8 +775,12 @@ namespace Umbraco.Core.Configuration
                        StartsWithContainer _newReservedList = new StartsWithContainer();
                        foreach (string reservedUrl in _reservedUrlsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
                        {
+                            if (string.IsNullOrWhiteSpace(reservedUrl))
+                               continue;
+                            
+
                            //resolves the url to support tilde chars
-                            string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl).Trim().ToLower();
+                            string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl.Trim()).Trim().ToLower();
                            if (reservedUrlTrimmed.Length > 0)
                                _newReservedList.Add(reservedUrlTrimmed);
                        }
@@ -706,8 +788,11 @@ namespace Umbraco.Core.Configuration
                        foreach (string reservedPath in _reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
                        {
                            bool trimEnd = !reservedPath.EndsWith("/");
+                            if (string.IsNullOrWhiteSpace(reservedPath))
+                                continue;
+                           
                            //resolves the url to support tilde chars
-                            string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath).Trim().ToLower();
+                            string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath.Trim()).Trim().ToLower();

                            if (reservedPathTrimmed.Length > 0)
                                _newReservedList.Add(reservedPathTrimmed + (reservedPathTrimmed.EndsWith("/") ? "" : "/"));
@@ -1,69 +1,69 @@
-using System;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// A full config section is required for any full element and we have some elements that are defined like this:
-    /// {element}MyValue{/element} instead of as attribute values.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class InnerTextConfigurationElement<T> : RawXmlConfigurationElement
-    {
-        public InnerTextConfigurationElement()
-        {
-        }
-
-        public InnerTextConfigurationElement(XElement rawXml) : base(rawXml)
-        {
-        }
-
-        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
-        {
-            base.DeserializeElement(reader, serializeCollectionKey);
-            //now validate and set the raw value
-            if (RawXml.HasElements)
-                throw new InvalidOperationException("An InnerTextConfigurationElement cannot contain any child elements, only attributes and a value");
-            RawValue = RawXml.Value.Trim();
-
-            //RawValue = reader.ReadElementContentAsString();
-        }
-
-        public virtual T Value
-        {
-            get
-            {
-                var converted = ObjectExtensions.TryConvertTo<T>(RawValue);
-                if (converted.Success == false)
-                    throw new InvalidCastException("Could not convert value " + RawValue + " to type " + typeof(T));
-                return converted.Result;
-            }
-        }
-
-        /// <summary>
-        /// Exposes the raw string value
-        /// </summary>
-        internal string RawValue { get; set; }
-
-        /// <summary>
-        /// Implicit operator so we don't need to use the 'Value' property explicitly
-        /// </summary>
-        /// <param name="m"></param>
-        /// <returns></returns>
-        public static implicit operator T(InnerTextConfigurationElement<T> m)
-        {
-            return m.Value;
-        }
-
-        /// <summary>
-        /// Return the string value of Value
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return string.Format("{0}", Value);
-        }
-
-    }
+using System;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// A full config section is required for any full element and we have some elements that are defined like this:
+    /// {element}MyValue{/element} instead of as attribute values.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class InnerTextConfigurationElement<T> : RawXmlConfigurationElement
+    {
+        public InnerTextConfigurationElement()
+        {
+        }
+
+        public InnerTextConfigurationElement(XElement rawXml) : base(rawXml)
+        {
+        }
+
+        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
+        {
+            base.DeserializeElement(reader, serializeCollectionKey);
+            //now validate and set the raw value
+            if (RawXml.HasElements)
+                throw new InvalidOperationException("An InnerTextConfigurationElement cannot contain any child elements, only attributes and a value");
+            RawValue = RawXml.Value.Trim();
+
+            //RawValue = reader.ReadElementContentAsString();
+        }
+
+        public virtual T Value
+        {
+            get
+            {
+                var converted = ObjectExtensions.TryConvertTo<T>(RawValue);
+                if (converted.Success == false)
+                    throw new InvalidCastException("Could not convert value " + RawValue + " to type " + typeof(T));
+                return converted.Result;
+            }
+        }
+
+        /// <summary>
+        /// Exposes the raw string value
+        /// </summary>
+        internal string RawValue { get; set; }
+
+        /// <summary>
+        /// Implicit operator so we don't need to use the 'Value' property explicitly
+        /// </summary>
+        /// <param name="m"></param>
+        /// <returns></returns>
+        public static implicit operator T(InnerTextConfigurationElement<T> m)
+        {
+            return m.Value;
+        }
+
+        /// <summary>
+        /// Return the string value of Value
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return string.Format("{0}", Value);
+        }
+
+    }
 }
@@ -1,43 +1,43 @@
-using System.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// Used for specifying default values for comma delimited config
-    /// </summary>
-    internal class OptionalCommaDelimitedConfigurationElement : CommaDelimitedConfigurationElement
-    {
-        private readonly CommaDelimitedConfigurationElement _wrapped;
-        private readonly string[] _defaultValue;
-
-        public OptionalCommaDelimitedConfigurationElement()
-        {            
-        }
-
-        public OptionalCommaDelimitedConfigurationElement(CommaDelimitedConfigurationElement wrapped, string[] defaultValue)
-        {
-            _wrapped = wrapped;
-            _defaultValue = defaultValue;
-        }
-
-        public override CommaDelimitedStringCollection Value
-        {
-            get
-            {
-                if (_wrapped == null)
-                {
-                    return base.Value;
-                }
-
-                if (string.IsNullOrEmpty(_wrapped.RawValue))
-                {
-                    var val = new CommaDelimitedStringCollection();
-                    val.AddRange(_defaultValue);
-                    return val;
-                }
-                return _wrapped.Value;
-            }
-        }
-    }
+using System.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// Used for specifying default values for comma delimited config
+    /// </summary>
+    internal class OptionalCommaDelimitedConfigurationElement : CommaDelimitedConfigurationElement
+    {
+        private readonly CommaDelimitedConfigurationElement _wrapped;
+        private readonly string[] _defaultValue;
+
+        public OptionalCommaDelimitedConfigurationElement()
+        {            
+        }
+
+        public OptionalCommaDelimitedConfigurationElement(CommaDelimitedConfigurationElement wrapped, string[] defaultValue)
+        {
+            _wrapped = wrapped;
+            _defaultValue = defaultValue;
+        }
+
+        public override CommaDelimitedStringCollection Value
+        {
+            get
+            {
+                if (_wrapped == null)
+                {
+                    return base.Value;
+                }
+
+                if (string.IsNullOrEmpty(_wrapped.RawValue))
+                {
+                    var val = new CommaDelimitedStringCollection();
+                    val.AddRange(_defaultValue);
+                    return val;
+                }
+                return _wrapped.Value;
+            }
+        }
+    }
 }
@@ -1,23 +1,23 @@
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// This is used to supply optional/default values when using InnerTextConfigurationElement
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class OptionalInnerTextConfigurationElement<T> : InnerTextConfigurationElement<T>
-    {
-        private readonly InnerTextConfigurationElement<T> _wrapped;
-        private readonly T _defaultValue;
-
-        public OptionalInnerTextConfigurationElement(InnerTextConfigurationElement<T> wrapped, T defaultValue)
-        {
-            _wrapped = wrapped;
-            _defaultValue = defaultValue;
-        }
-
-        public override T Value
-        {
-            get { return string.IsNullOrEmpty(_wrapped.RawValue) ? _defaultValue : _wrapped.Value; }
-        }
-    }
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// This is used to supply optional/default values when using InnerTextConfigurationElement
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class OptionalInnerTextConfigurationElement<T> : InnerTextConfigurationElement<T>
+    {
+        private readonly InnerTextConfigurationElement<T> _wrapped;
+        private readonly T _defaultValue;
+
+        public OptionalInnerTextConfigurationElement(InnerTextConfigurationElement<T> wrapped, T defaultValue)
+        {
+            _wrapped = wrapped;
+            _defaultValue = defaultValue;
+        }
+
+        public override T Value
+        {
+            get { return string.IsNullOrEmpty(_wrapped.RawValue) ? _defaultValue : _wrapped.Value; }
+        }
+    }
 }
@@ -1,30 +1,30 @@
-using System.Configuration;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// A configuration section that simply exposes the entire raw xml of the section itself which inheritors can use
-    /// to do with as they please.
-    /// </summary>
-    internal abstract class RawXmlConfigurationElement : ConfigurationElement
-    {
-        protected RawXmlConfigurationElement()
-        {
-            
-        }
-
-        protected RawXmlConfigurationElement(XElement rawXml)
-        {
-            RawXml = rawXml;
-        }
-
-        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
-        {
-            RawXml = (XElement)XNode.ReadFrom(reader);
-        }
-
-        protected XElement RawXml { get; private set; }
-    }
+using System.Configuration;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// A configuration section that simply exposes the entire raw xml of the section itself which inheritors can use
+    /// to do with as they please.
+    /// </summary>
+    internal abstract class RawXmlConfigurationElement : ConfigurationElement
+    {
+        protected RawXmlConfigurationElement()
+        {
+            
+        }
+
+        protected RawXmlConfigurationElement(XElement rawXml)
+        {
+            RawXml = rawXml;
+        }
+
+        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
+        {
+            RawXml = (XElement)XNode.ReadFrom(reader);
+        }
+
+        protected XElement RawXml { get; private set; }
+    }
 }
@@ -1,127 +1,136 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Threading;
-using Umbraco.Core.Configuration.BaseRest;
-using Umbraco.Core.Configuration.Dashboard;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// The gateway to all umbraco configuration
-    /// </summary>
-    public class UmbracoConfig
-    {
-        #region Singleton
-
-        private static readonly Lazy<UmbracoConfig> Lazy = new Lazy<UmbracoConfig>(() => new UmbracoConfig());
-
-        public static UmbracoConfig For
-        {
-            get { return Lazy.Value; }            
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Default constructor 
-        /// </summary>
-        private UmbracoConfig()
-        {
-            if (_umbracoSettings == null)
-            {
-                var umbracoSettings = ConfigurationManager.GetSection("umbracoConfiguration/settings") as IUmbracoSettingsSection;
-                if (umbracoSettings == null)
-                {
-                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IUmbracoSettingsSection) + " from config file!");
-                }
-                SetUmbracoSettings(umbracoSettings);
-            }
-
-            if (_baseRestExtensions == null)
-            {
-                var baseRestExtensions = ConfigurationManager.GetSection("umbracoConfiguration/BaseRestExtensions") as IBaseRestSection;
-                if (baseRestExtensions == null)
-                {
-                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IBaseRestSection) + " from config file!");
-                }
-                SetBaseRestExtensions(baseRestExtensions);
-            }
-
-            if (_dashboardSection == null)
-            {
-                var dashboardConfig = ConfigurationManager.GetSection("umbracoConfiguration/dashBoard") as IDashboardSection;
-                if (dashboardConfig == null)
-                {
-                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IDashboardSection) + " from config file!");
-                }
-                SetDashboardSettings(dashboardConfig);
-            }
-        }
-
-        /// <summary>
-        /// Constructor - can be used for testing
-        /// </summary>
-        /// <param name="umbracoSettings"></param>
-        /// <param name="baseRestSettings"></param>
-        /// <param name="dashboardSettings"></param>
-        public UmbracoConfig(IUmbracoSettingsSection umbracoSettings, IBaseRestSection baseRestSettings, IDashboardSection dashboardSettings)
-        {
-            SetUmbracoSettings(umbracoSettings);
-            SetBaseRestExtensions(baseRestSettings);
-            SetDashboardSettings(dashboardSettings);
-        }
-
-        private IDashboardSection _dashboardSection;
-        private IUmbracoSettingsSection _umbracoSettings;
-        private IBaseRestSection _baseRestExtensions;
-
-        /// <summary>
-        /// Gets the IDashboardSection
-        /// </summary>
-        public IDashboardSection DashboardSettings()
-        {
-            return _dashboardSection;
-        }        
-
-        //ONLY for unit testing
-        internal void SetDashboardSettings(IDashboardSection value)
-        {
-            _dashboardSection = value;
-        }
-
-        //ONLY for unit testing
-        internal void SetUmbracoSettings(IUmbracoSettingsSection value)
-        {
-            _umbracoSettings = value;
-        }
-
-        /// <summary>
-        /// Gets the IUmbracoSettings
-        /// </summary>
-        public IUmbracoSettingsSection UmbracoSettings()
-        {
-            return _umbracoSettings;
-        }
-        
-        //ONLY for unit testing
-        public void SetBaseRestExtensions(IBaseRestSection value)
-        {
-            _baseRestExtensions = value;
-        }
-
-        /// <summary>
-        /// Gets the IBaseRestSection
-        /// </summary>
-        public IBaseRestSection BaseRestExtensions()
-        {
-            return _baseRestExtensions;
-        }
-
-        //TODO: Add other configurations here !
-    }
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Threading;
+using Umbraco.Core.Configuration.BaseRest;
+using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// The gateway to all umbraco configuration
+    /// </summary>
+    public class UmbracoConfig
+    {
+        #region Singleton
+
+        private static readonly Lazy<UmbracoConfig> Lazy = new Lazy<UmbracoConfig>(() => new UmbracoConfig());
+
+        public static UmbracoConfig For
+        {
+            get { return Lazy.Value; }            
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Default constructor 
+        /// </summary>
+        private UmbracoConfig()
+        {
+            if (_umbracoSettings == null)
+            {
+                var umbracoSettings = ConfigurationManager.GetSection("umbracoConfiguration/settings") as IUmbracoSettingsSection;                
+                SetUmbracoSettings(umbracoSettings);
+            }
+
+            if (_baseRestExtensions == null)
+            {
+                var baseRestExtensions = ConfigurationManager.GetSection("umbracoConfiguration/BaseRestExtensions") as IBaseRestSection;                
+                SetBaseRestExtensions(baseRestExtensions);
+            }
+
+            if (_dashboardSection == null)
+            {
+                var dashboardConfig = ConfigurationManager.GetSection("umbracoConfiguration/dashBoard") as IDashboardSection;                
+                SetDashboardSettings(dashboardConfig);
+            }
+        }
+
+        /// <summary>
+        /// Constructor - can be used for testing
+        /// </summary>
+        /// <param name="umbracoSettings"></param>
+        /// <param name="baseRestSettings"></param>
+        /// <param name="dashboardSettings"></param>
+        public UmbracoConfig(IUmbracoSettingsSection umbracoSettings, IBaseRestSection baseRestSettings, IDashboardSection dashboardSettings)
+        {
+            SetUmbracoSettings(umbracoSettings);
+            SetBaseRestExtensions(baseRestSettings);
+            SetDashboardSettings(dashboardSettings);
+        }
+
+        private IDashboardSection _dashboardSection;
+        private IUmbracoSettingsSection _umbracoSettings;
+        private IBaseRestSection _baseRestExtensions;
+
+        /// <summary>
+        /// Gets the IDashboardSection
+        /// </summary>
+        public IDashboardSection DashboardSettings()
+        {
+            if (_dashboardSection == null)
+            {
+                var ex = new ConfigurationErrorsException("Could not load the " + typeof(IDashboardSection) + " from config file, ensure the web.config and Dashboard.config files are formatted correctly");
+                LogHelper.Error<UmbracoConfig>("Config error", ex);
+                throw ex;
+            }
+
+            return _dashboardSection;
+        }        
+
+        //ONLY for unit testing
+        internal void SetDashboardSettings(IDashboardSection value)
+        {
+            _dashboardSection = value;
+        }
+
+        //ONLY for unit testing
+        internal void SetUmbracoSettings(IUmbracoSettingsSection value)
+        {
+            _umbracoSettings = value;
+        }
+
+        /// <summary>
+        /// Gets the IUmbracoSettings
+        /// </summary>
+        public IUmbracoSettingsSection UmbracoSettings()
+        {
+            if (_umbracoSettings == null)
+            {
+                var ex = new ConfigurationErrorsException("Could not load the " + typeof (IUmbracoSettingsSection) + " from config file, ensure the web.config and umbracoSettings.config files are formatted correctly");
+                LogHelper.Error<UmbracoConfig>("Config error", ex);
+                throw ex;
+            }
+
+            return _umbracoSettings;
+        }
+        
+        //ONLY for unit testing
+        public void SetBaseRestExtensions(IBaseRestSection value)
+        {
+            _baseRestExtensions = value;
+        }
+
+        /// <summary>
+        /// Gets the IBaseRestSection
+        /// </summary>
+        public IBaseRestSection BaseRestExtensions()
+        {
+            if (_baseRestExtensions == null)
+            {
+                var ex = new ConfigurationErrorsException("Could not load the " + typeof(IBaseRestSection) + " from config file, ensure the web.config and BaseRestExtensions.config files are formatted correctly");
+                LogHelper.Error<UmbracoConfig>("Config error", ex);
+                throw ex;
+            }
+
+            return _baseRestExtensions;
+        }
+
+        //TODO: Add other configurations here !
+    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Configuration;

 namespace Umbraco.Core.Configuration.UmbracoSettings
@@ -26,7 +27,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
                return new OptionalInnerTextConfigurationElement<bool>(
                       (InnerTextConfigurationElement<bool>)this["ResolveUrlsFromTextString"],
                        //set the default
-                       true);
+                       false);
            }
        }

@@ -217,6 +218,19 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            }
        }

+        [Obsolete("This is here so that if this config element exists we won't get a YSOD, it is not used whatsoever and will be removed in future versions")]
+        [ConfigurationProperty("DocumentTypeIconList")]
+        internal InnerTextConfigurationElement<IconPickerBehaviour> DocumentTypeIconList
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<IconPickerBehaviour>(
+                          (InnerTextConfigurationElement<IconPickerBehaviour>)this["DocumentTypeIconList"],
+                    //set the default
+                          IconPickerBehaviour.HideFileDuplicates);
+            }
+        }
+
        [ConfigurationProperty("disallowedUploadFiles")]
        internal CommaDelimitedConfigurationElement DisallowedUploadFiles
        {
@@ -380,7 +394,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        {
            get { return MacroErrors; }
        }
-        
+
        IEnumerable<string> IContentSection.DisallowedUploadFiles
        {
            get { return DisallowedUploadFiles; }
@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using System.Configuration;
+using System.Configuration;

 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
    internal class ContentImagingElement : ConfigurationElement
    {
+     
        [ConfigurationProperty("imageFileTypes")]
        internal CommaDelimitedConfigurationElement ImageFileTypes
        {
@@ -1,8 +1,8 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IChar
-    {
-        string Char { get; }
-        string Replacement { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IChar
+    {
+        string Char { get; }
+        string Replacement { get; }
+    }
 }
@@ -1,8 +1,8 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IContentErrorPage
-    {
-        int ContentId { get; }
-        string Culture { get; set; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IContentErrorPage
+    {
+        int ContentId { get; }
+        string Culture { get; set; }
+    }
 }
@@ -1,63 +1,63 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IContentSection : IUmbracoConfigurationSection
-    {
-        string NotificationEmailAddress { get; }
-
-        bool DisableHtmlEmail { get; }
-
-        IEnumerable<string> ImageFileTypes { get; }
-
-        IEnumerable<string> ImageTagAllowedAttributes { get; }
-
-        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
-
-        string ScriptFolderPath { get; }
-
-        IEnumerable<string> ScriptFileTypes { get; }
-
-        bool ScriptEditorDisable { get; }
-
-        bool ResolveUrlsFromTextString { get; }
-
-        bool UploadAllowDirectories { get; }
-
-        IEnumerable<IContentErrorPage> Error404Collection { get; }
-
-        bool EnsureUniqueNaming { get; }
-
-        bool TidyEditorContent { get; }
-
-        string TidyCharEncoding { get; }
-
-        bool XmlCacheEnabled { get; }
-
-        bool ContinouslyUpdateXmlDiskCache { get; }
-
-        bool XmlContentCheckForDiskChanges { get; }
-
-        bool EnableSplashWhileLoading { get; }
-
-        string PropertyContextHelpOption { get; }
-
-        bool UseLegacyXmlSchema { get; }
-
-        bool ForceSafeAliases { get; }
-
-        string PreviewBadge { get; }
-
-        int UmbracoLibraryCacheDuration { get; }
-
-        MacroErrorBehaviour MacroErrorBehaviour { get; }
-        
-        IEnumerable<string> DisallowedUploadFiles { get; }
-
-        bool CloneXmlContent { get; }
-
-        bool GlobalPreviewStorageEnabled { get; }
-
-        string DefaultDocumentTypeProperty { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IContentSection : IUmbracoConfigurationSection
+    {
+        string NotificationEmailAddress { get; }
+
+        bool DisableHtmlEmail { get; }
+
+        IEnumerable<string> ImageFileTypes { get; }
+
+        IEnumerable<string> ImageTagAllowedAttributes { get; }
+
+        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
+
+        string ScriptFolderPath { get; }
+
+        IEnumerable<string> ScriptFileTypes { get; }
+
+        bool ScriptEditorDisable { get; }
+
+        bool ResolveUrlsFromTextString { get; }
+
+        bool UploadAllowDirectories { get; }
+
+        IEnumerable<IContentErrorPage> Error404Collection { get; }
+
+        bool EnsureUniqueNaming { get; }
+
+        bool TidyEditorContent { get; }
+
+        string TidyCharEncoding { get; }
+
+        bool XmlCacheEnabled { get; }
+
+        bool ContinouslyUpdateXmlDiskCache { get; }
+
+        bool XmlContentCheckForDiskChanges { get; }
+
+        bool EnableSplashWhileLoading { get; }
+
+        string PropertyContextHelpOption { get; }
+
+        bool UseLegacyXmlSchema { get; }
+
+        bool ForceSafeAliases { get; }
+
+        string PreviewBadge { get; }
+
+        int UmbracoLibraryCacheDuration { get; }
+
+        MacroErrorBehaviour MacroErrorBehaviour { get; }
+        
+        IEnumerable<string> DisallowedUploadFiles { get; }
+
+        bool CloneXmlContent { get; }
+
+        bool GlobalPreviewStorageEnabled { get; }
+
+        string DefaultDocumentTypeProperty { get; }
+    }
 }
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IDeveloperSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IFileExtension> AppCodeFileExtensions { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IDeveloperSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<IFileExtension> AppCodeFileExtensions { get; }
+    }
 }
@@ -1,13 +1,13 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IDistributedCallSection : IUmbracoConfigurationSection
-    {
-        bool Enabled { get; }
-
-        int UserId { get; }
-
-        IEnumerable<IServer> Servers { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IDistributedCallSection : IUmbracoConfigurationSection
+    {
+        bool Enabled { get; }
+
+        int UserId { get; }
+
+        IEnumerable<IServer> Servers { get; }
+    }
 }
@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IFileExtension
-    {
-        string Extension { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IFileExtension
+    {
+        string Extension { get; }
+    }
 }
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IHelpSection : IUmbracoConfigurationSection
-    {
-        string DefaultUrl { get; }
-
-        IEnumerable<ILink> Links { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IHelpSection : IUmbracoConfigurationSection
+    {
+        string DefaultUrl { get; }
+
+        IEnumerable<ILink> Links { get; }
+    }
 }
@@ -1,18 +1,18 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IImagingAutoFillUploadField
-    {
-        /// <summary>
-        /// Allow setting internally so we can create a default
-        /// </summary>
-        string Alias { get; }
-
-        string WidthFieldAlias { get; }
-
-        string HeightFieldAlias { get; }
-
-        string LengthFieldAlias { get; }
-
-        string ExtensionFieldAlias { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IImagingAutoFillUploadField
+    {
+        /// <summary>
+        /// Allow setting internally so we can create a default
+        /// </summary>
+        string Alias { get; }
+
+        string WidthFieldAlias { get; }
+
+        string HeightFieldAlias { get; }
+
+        string LengthFieldAlias { get; }
+
+        string ExtensionFieldAlias { get; }
+    }
 }
@@ -1,15 +1,15 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILink
-    {
-        string Application { get; }
-
-        string ApplicationUrl { get; }
-
-        string Language { get; }
-
-        string UserType { get; }
-
-        string HelpUrl { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ILink
+    {
+        string Application { get; }
+
+        string ApplicationUrl { get; }
+
+        string Language { get; }
+
+        string UserType { get; }
+
+        string HelpUrl { get; }
+    }
 }
@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILogType
-    {
-        string LogTypeAlias { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ILogType
+    {
+        string LogTypeAlias { get; }
+    }
 }
@@ -1,27 +1,27 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILoggingSection : IUmbracoConfigurationSection
-    {
-        bool AutoCleanLogs { get; }
-
-        bool EnableLogging { get; }
-
-        bool EnableAsyncLogging { get; }
-
-        int CleaningMiliseconds { get; }
-
-        int MaxLogAge { get; }
-
-        IEnumerable<ILogType> DisabledLogTypes { get; }
-
-        string ExternalLoggerAssembly { get; }
-
-        string ExternalLoggerType { get; }
-
-        bool ExternalLoggerEnableAuditTrail { get; }
-
-        bool ExternalLoggerIsConfigured { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ILoggingSection : IUmbracoConfigurationSection
+    {
+        bool AutoCleanLogs { get; }
+
+        bool EnableLogging { get; }
+
+        bool EnableAsyncLogging { get; }
+
+        int CleaningMiliseconds { get; }
+
+        int MaxLogAge { get; }
+
+        IEnumerable<ILogType> DisabledLogTypes { get; }
+
+        string ExternalLoggerAssembly { get; }
+
+        string ExternalLoggerType { get; }
+
+        bool ExternalLoggerEnableAuditTrail { get; }
+
+        bool ExternalLoggerIsConfigured { get; }
+    }
 }
@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface INotDynamicXmlDocument
-    {
-        string Element { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface INotDynamicXmlDocument
+    {
+        string Element { get; }
+    }
 }
@@ -1,9 +1,9 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IProvidersSection : IUmbracoConfigurationSection
-    {        
-        string DefaultBackOfficeUserProvider { get; }
-    }
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IProvidersSection : IUmbracoConfigurationSection
+    {        
+        string DefaultBackOfficeUserProvider { get; }
+    }
 }
@@ -1,12 +1,12 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRazorStaticMapping
-    {
-        Guid DataTypeGuid { get; }
-        string NodeTypeAlias { get; }
-        string PropertyTypeAlias { get; }
-        string MappingName { get; }
-    }
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IRazorStaticMapping
+    {
+        Guid DataTypeGuid { get; }
+        string NodeTypeAlias { get; }
+        string PropertyTypeAlias { get; }
+        string MappingName { get; }
+    }
 }
@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-
-    public interface IRepositoriesSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IRepository> Repositories { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+
+    public interface IRepositoriesSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<IRepository> Repositories { get; }
+    }
 }
@@ -1,13 +1,13 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRepository
-    {
-        string Name { get; }
-        Guid Id { get;  }
-        string RepositoryUrl { get; }
-        string WebServiceUrl { get; }
-        bool HasCustomWebServiceUrl { get; }
-    }
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IRepository
+    {
+        string Name { get; }
+        Guid Id { get;  }
+        string RepositoryUrl { get; }
+        string WebServiceUrl { get; }
+        bool HasCustomWebServiceUrl { get; }
+    }
 }
@@ -1,15 +1,17 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRequestHandlerSection : IUmbracoConfigurationSection
-    {
-        bool UseDomainPrefixes { get; }
-
-        bool AddTrailingSlash { get; }
-
-        bool RemoveDoubleDashes { get; }
-
-        IEnumerable<IChar> CharCollection { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IRequestHandlerSection : IUmbracoConfigurationSection
+    {
+        bool UseDomainPrefixes { get; }
+
+        bool AddTrailingSlash { get; }
+
+        bool RemoveDoubleDashes { get; }
+
+        bool ConvertUrlsToAscii { get; }
+
+        IEnumerable<IChar> CharCollection { get; }
+    }
 }
@@ -1,13 +1,13 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScheduledTask
-    {
-        string Alias { get; }
-
-        bool Log { get; }
-
-        int Interval { get; }
-
-        string Url { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IScheduledTask
+    {
+        string Alias { get; }
+
+        bool Log { get; }
+
+        int Interval { get; }
+
+        string Url { get; }
+    }
 }
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScheduledTasksSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IScheduledTask> Tasks { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IScheduledTasksSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<IScheduledTask> Tasks { get; }
+    }
 }
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScriptingSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<INotDynamicXmlDocument> NotDynamicXmlDocumentElements { get; }
-
-        IEnumerable<IRazorStaticMapping> DataTypeModelStaticMappings { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IScriptingSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<INotDynamicXmlDocument> NotDynamicXmlDocumentElements { get; }
+
+        IEnumerable<IRazorStaticMapping> DataTypeModelStaticMappings { get; }
+    }
 }
@@ -1,13 +1,13 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ISecuritySection : IUmbracoConfigurationSection
-    {
-        bool KeepUserLoggedIn { get; }
-
-        bool HideDisabledUsersInBackoffice { get; }
-
-        string AuthCookieName { get; }
-
-        string AuthCookieDomain { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ISecuritySection : IUmbracoConfigurationSection
+    {
+        bool KeepUserLoggedIn { get; }
+
+        bool HideDisabledUsersInBackoffice { get; }
+
+        string AuthCookieName { get; }
+
+        string AuthCookieDomain { get; }
+    }
 }
@@ -1,9 +1,9 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IServer
-    {
-        string ForcePortnumber { get; }
-        string ForceProtocol { get; }
-        string ServerAddress { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IServer
+    {
+        string ForcePortnumber { get; }
+        string ForceProtocol { get; }
+        string ServerAddress { get; }
+    }
 }
@@ -1,13 +1,13 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ITemplatesSection : IUmbracoConfigurationSection
-    {
-        bool UseAspNetMasterPages { get; }
-
-        bool EnableSkinSupport { get; }
-
-        RenderingEngine DefaultRenderingEngine { get; }
-
-        bool EnableTemplateFolders { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ITemplatesSection : IUmbracoConfigurationSection
+    {
+        bool UseAspNetMasterPages { get; }
+
+        bool EnableSkinSupport { get; }
+
+        RenderingEngine DefaultRenderingEngine { get; }
+
+        bool EnableTemplateFolders { get; }
+    }
 }
@@ -1,33 +1,33 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
-    {
-        IContentSection Content { get; }
-
-        ISecuritySection Security { get; }
-
-        IRequestHandlerSection RequestHandler { get; }
-
-        ITemplatesSection Templates { get; }
-
-        IDeveloperSection Developer { get; }
-
-        IViewStateMoverModuleSection ViewStateMoverModule { get; }
-
-        ILoggingSection Logging { get; }
-
-        IScheduledTasksSection ScheduledTasks { get; }
-
-        IDistributedCallSection DistributedCall { get; }
-
-        IRepositoriesSection PackageRepositories { get; }
-
-        IProvidersSection Providers { get; }
-
-        IHelpSection Help { get; }
-
-        IWebRoutingSection WebRouting { get; }
-
-        IScriptingSection Scripting { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
+    {
+        IContentSection Content { get; }
+
+        ISecuritySection Security { get; }
+
+        IRequestHandlerSection RequestHandler { get; }
+
+        ITemplatesSection Templates { get; }
+
+        IDeveloperSection Developer { get; }
+
+        IViewStateMoverModuleSection ViewStateMoverModule { get; }
+
+        ILoggingSection Logging { get; }
+
+        IScheduledTasksSection ScheduledTasks { get; }
+
+        IDistributedCallSection DistributedCall { get; }
+
+        IRepositoriesSection PackageRepositories { get; }
+
+        IProvidersSection Providers { get; }
+
+        IHelpSection Help { get; }
+
+        IWebRoutingSection WebRouting { get; }
+
+        IScriptingSection Scripting { get; }
+    }
 }
@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IViewStateMoverModuleSection : IUmbracoConfigurationSection
-    {
-        bool Enable { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IViewStateMoverModuleSection : IUmbracoConfigurationSection
+    {
+        bool Enable { get; }
+    }
 }
@@ -1,12 +1,12 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IWebRoutingSection : IUmbracoConfigurationSection
-    {
-        bool TrySkipIisCustomErrors { get; }
-
-        bool InternalRedirectPreservesTemplate { get; }
-
-        string UrlProviderMode { get; }
-    }
-
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IWebRoutingSection : IUmbracoConfigurationSection
+    {
+        bool TrySkipIisCustomErrors { get; }
+
+        bool InternalRedirectPreservesTemplate { get; }
+
+        string UrlProviderMode { get; }
+    }
+
 }
--- a/Show More
+++ b/Show More