https://github.com/umbraco/Umbraco-CMS/issues/5665 : Resolved issue where adding non-admin user group editor to group already exists

Merge pull request #5423 from umbraco/v7/bugfix/4144-member-password-manual-change-fix
Fixes #4144 - AllowManuallyChangingPassword Regression Fix
2019-06-17 08:43:24 +02:00 · 2019-06-13 08:53:17 +01:00 · 2019-06-13 16:50:15 +10:00 · 2019-06-12 12:51:26 +10:00 · 2019-06-07 16:02:03 +02:00 · 2019-06-07 14:32:02 +02:00
258 changed files with 6986 additions and 4225 deletions
@@ -1,4 +1,4 @@
-_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/.github/V8_GETTING_STARTED.md) to go to the v8 branch_
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/dev-v8/.github/V8_GETTING_STARTED.md) to go to the v8 branch_
 # Contributing to Umbraco CMS

 👍🎉 First off, thanks for taking the time to contribute! 🎉👍
@@ -16,7 +16,7 @@ This document gives you a quick overview on how to get started, we will link to

 ## Guidelines for contributions we welcome

-Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valueable time.
+Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valuable time.

 We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md). Make sure to talk to us before making large changes.

@@ -1,4 +1,5 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7)
+[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)

 _Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/tree/temp8) to go to the v8 branch_

@@ -135,7 +135,9 @@ function Get-UmbracoBuildEnv
  $vsPath = ""
  $vsVer = ""
  $msBuild = $null
-  &$vswhere | foreach {
+  $params = @()
+  $params += "-prerelease"
+  &$vswhere @params | foreach {
    if ($_.StartsWith("installationPath:")) { $vsPath = $_.SubString("installationPath:".Length).Trim() }
    if ($_.StartsWith("installationVersion:")) { $vsVer = $_.SubString("installationVersion:".Length).Trim() }
  }
@@ -144,7 +146,10 @@ function Get-UmbracoBuildEnv
    $vsVerParts = $vsVer.Split('.')
    $vsMajor = [int]::Parse($vsVerParts[0])
    $vsMinor = [int]::Parse($vsVerParts[1])
-    if ($vsMajor -eq 15) {
+    if ($vsMajor -eq 16) {
+      $msBuild = "$vsPath\MSBuild\Current\Bin"
+    }	
+    elseif ($vsMajor -eq 15) {
      $msBuild = "$vsPath\MSBuild\$vsMajor.0\Bin"
    }
    elseif ($vsMajor -eq 14) {
@@ -195,6 +195,10 @@ function Compile-Umbraco
  {
    $toolsVersion = "15.0"
  }
+  if ($uenv.VisualStudio.Major -eq 16)
+  {
+    $toolsVersion = "Current"
+  }
    
  Write-Host ">> Compile Umbraco"
  Write-Host "Logging to $tmp\msbuild.umbraco.log"
@@ -1,107 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="3.4.4">
-    <id>UmbracoCms.Core</id>
-    <version>7.0.0</version>
-    <title>Umbraco Cms Core Binaries</title>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-    <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
-    <language>en-US</language>
-    <tags>umbraco</tags>
-    <dependencies>      
-      <dependency id="log4net" version="[2.0.8,3.0.0)" />
-      <dependency id="Log4Net.Async" version="[2.0.4,3.0.0)" />
-      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.3,6.0.0)" />
-      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
-      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.1.0, 4.0.0)" />
-      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.1.0, 4.0.0)" />
-      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.1.0, 4.0.0)" />
-      <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
-      <dependency id="HtmlAgilityPack" version="[1.4.9.5, 2.0.0)" />
-      <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
-      <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.7, 2.0.0)" />
-      <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
-      <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Examine" version="[0.1.89, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
-      <dependency id="semver" version="[1.1.2, 3.0.0)" />
-	    <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
-      <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
-      <dependency id="System.ValueTuple" version="[4.4.0, 5.0.0)" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="$BuildTmp$\WebApp\bin\businesslogic.dll" target="lib\net45\businesslogic.dll" />
-    <file src="$BuildTmp$\WebApp\bin\businesslogic.xml" target="lib\net45\businesslogic.xml" />
-    <file src="$BuildTmp$\WebApp\bin\cms.dll" target="lib\net45\cms.dll" />
-    <file src="$BuildTmp$\WebApp\bin\cms.xml" target="lib\net45\cms.xml" />
-    <file src="$BuildTmp$\WebApp\bin\controls.dll" target="lib\net45\controls.dll" />
-    <file src="$BuildTmp$\WebApp\bin\controls.xml" target="lib\net45\controls.xml" />
-    <file src="$BuildTmp$\WebApp\bin\interfaces.dll" target="lib\net45\interfaces.dll" />
-    <file src="$BuildTmp$\WebApp\bin\interfaces.xml" target="lib\net45\interfaces.xml" />
-    <file src="$BuildTmp$\WebApp\bin\log4net.dll" target="lib\net45\log4net.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net45\Microsoft.ApplicationBlocks.Data.dll" />
-    <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.dll" target="lib\net45\SQLCE4Umbraco.dll" />
-    <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.xml" target="lib\net45\SQLCE4Umbraco.xml" />
-    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\net45\System.Data.SqlServerCe.dll" />
-    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\net45\System.Data.SqlServerCe.Entity.dll" />
-    <file src="$BuildTmp$\WebApp\bin\TidyNet.dll" target="lib\net45\TidyNet.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net45\Umbraco.Core.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net45\Umbraco.Core.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.dll" target="lib\net45\umbraco.DataLayer.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.xml" target="lib\net45\umbraco.DataLayer.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.dll" target="lib\net45\umbraco.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.xml" target="lib\net45\umbraco.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.dll" target="lib\net45\umbraco.editorControls.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.xml" target="lib\net45\umbraco.editorControls.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.dll" target="lib\net45\umbraco.MacroEngines.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.xml" target="lib\net45\umbraco.MacroEngines.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.providers.dll" target="lib\net45\umbraco.providers.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.providers.xml" target="lib\net45\umbraco.providers.xml" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net45\Umbraco.Web.UI.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net45\Umbraco.Web.UI.xml" />
-    <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.dll" target="lib\net45\UmbracoExamine.dll" />
-    <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.xml" target="lib\net45\UmbracoExamine.xml" />
-    <file src="tools\install.core.ps1" target="tools\install.ps1" />
+    <metadata minClientVersion="3.4.4">
+        <id>UmbracoCms.Core</id>
+        <version>7.0.0</version>
+        <title>Umbraco Cms Core Binaries</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+        <projectUrl>http://umbraco.com/</projectUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <dependencies>
+            <group targetFramework="net452">
+                <dependency id="log4net" version="[2.0.8, 3.0.0)" />
+                <dependency id="Log4Net.Async" version="[2.0.4, 3.0.0)" />
+                <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7, 6.0.0)" />
+                <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7, 6.0.0)" />
+                <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2, 3.0.0)" />
+                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.1, 3.0.0)" />
+                <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1, 5.0.0)" />
+                <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1, 5.0.0)" />
+                <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1, 5.0.0)" />
+                <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
+                <dependency id="HtmlAgilityPack" version="[1.8.8, 2.0.0)" />
+                <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
+                <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
+                <dependency id="ClientDependency" version="[1.9.7, 2.0.0)" />
+                <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
+                <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
+                <dependency id="Newtonsoft.Json" version="[12.0.2, 13.0.0)" />
+                <dependency id="Examine" version="[0.1.90, 1.0.0)" />
+                <dependency id="ImageProcessor" version="[2.7.0.100, 3.0.0)" />
+                <dependency id="ImageProcessor.Web" version="[4.10.0.100, 5.0.0)" />
+                <dependency id="semver" version="[1.1.2, 3.0.0)" />
+                <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
+                <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
+                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0, 5.0.0)" />
+                <dependency id="System.ValueTuple" version="[4.5.0, 5.0.0)" />
+            </group>
+        </dependencies>
+        <frameworkAssemblies>
+            <frameworkAssembly assemblyName="System.Configuration" targetFramework="net452"  />
+            <frameworkAssembly assemblyName="System.IO.Compression.FileSystem" targetFramework="net452"  />
+            <frameworkAssembly assemblyName="System.Web" targetFramework="net452"  />
+            <frameworkAssembly assemblyName="System.Net.Http" targetFramework="net452"  />
+            <frameworkAssembly assemblyName="System.Drawing" targetFramework="net452"  />
+        </frameworkAssemblies>
+    </metadata>
+    <files>
+        <file src="$BuildTmp$\WebApp\bin\businesslogic.dll" target="lib\net452\businesslogic.dll" />
+        <file src="$BuildTmp$\WebApp\bin\businesslogic.xml" target="lib\net452\businesslogic.xml" />
+        <file src="$BuildTmp$\WebApp\bin\cms.dll" target="lib\net452\cms.dll" />
+        <file src="$BuildTmp$\WebApp\bin\cms.xml" target="lib\net452\cms.xml" />
+        <file src="$BuildTmp$\WebApp\bin\controls.dll" target="lib\net452\controls.dll" />
+        <file src="$BuildTmp$\WebApp\bin\controls.xml" target="lib\net452\controls.xml" />
+        <file src="$BuildTmp$\WebApp\bin\interfaces.dll" target="lib\net452\interfaces.dll" />
+        <file src="$BuildTmp$\WebApp\bin\interfaces.xml" target="lib\net452\interfaces.xml" />
+        <file src="$BuildTmp$\WebApp\bin\log4net.dll" target="lib\net452\log4net.dll" />
+        <file src="$BuildTmp$\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net452\Microsoft.ApplicationBlocks.Data.dll" />
+        <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.dll" target="lib\net452\SQLCE4Umbraco.dll" />
+        <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.xml" target="lib\net452\SQLCE4Umbraco.xml" />
+        <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\net452\System.Data.SqlServerCe.dll" />
+        <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\net452\System.Data.SqlServerCe.Entity.dll" />
+        <file src="$BuildTmp$\WebApp\bin\TidyNet.dll" target="lib\net452\TidyNet.dll" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net452\Umbraco.Core.dll" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net452\Umbraco.Core.xml" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.dll" target="lib\net452\umbraco.DataLayer.dll" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.xml" target="lib\net452\umbraco.DataLayer.xml" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.dll" target="lib\net452\umbraco.dll" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.xml" target="lib\net452\umbraco.xml" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.dll" target="lib\net452\umbraco.editorControls.dll" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.xml" target="lib\net452\umbraco.editorControls.xml" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.dll" target="lib\net452\umbraco.MacroEngines.dll" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.xml" target="lib\net452\umbraco.MacroEngines.xml" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.providers.dll" target="lib\net452\umbraco.providers.dll" />
+        <file src="$BuildTmp$\WebApp\bin\umbraco.providers.xml" target="lib\net452\umbraco.providers.xml" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net452\Umbraco.Web.UI.dll" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net452\Umbraco.Web.UI.xml" />
+        <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.dll" target="lib\net452\UmbracoExamine.dll" />
+        <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.xml" target="lib\net452\UmbracoExamine.xml" />
+        <file src="tools\install.core.ps1" target="tools\install.ps1" />

-    <!-- Added to be able to produce a symbols package -->
-    <file src="$BuildTmp$\bin\SQLCE4Umbraco.pdb" target="lib" />
-    <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
-    <file src="$BuildTmp$\bin\businesslogic.pdb" target="lib" />
-    <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
-    <file src="$BuildTmp$\bin\cms.pdb" target="lib" />
-    <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
-    <file src="$BuildTmp$\bin\controls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
-    <file src="$BuildTmp$\bin\interfaces.pdb" target="lib" />
-    <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
-    <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
-    <file src="$BuildTmp$\bin\umbraco.DataLayer.pdb" target="lib" />
-    <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
-    <file src="$BuildTmp$\bin\umbraco.editorControls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
-    <file src="$BuildTmp$\bin\umbraco.MacroEngines.pdb" target="lib" />
-    <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
-    <file src="$BuildTmp$\bin\umbraco.providers.pdb" target="lib" />
-    <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
-    <file src="$BuildTmp$\bin\umbraco.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
-    <file src="$BuildTmp$\bin\Umbraco.Web.UI.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
-    <file src="$BuildTmp$\bin\UmbracoExamine.pdb" target="lib" />
-    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
-  </files>
+        <!-- Added to be able to produce a symbols package -->
+        <file src="$BuildTmp$\bin\SQLCE4Umbraco.pdb" target="lib" />
+        <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
+        <file src="$BuildTmp$\bin\businesslogic.pdb" target="lib" />
+        <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
+        <file src="$BuildTmp$\bin\cms.pdb" target="lib" />
+        <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
+        <file src="$BuildTmp$\bin\controls.pdb" target="lib" />
+        <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
+        <file src="$BuildTmp$\bin\interfaces.pdb" target="lib" />
+        <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
+        <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
+        <file src="$BuildTmp$\bin\umbraco.DataLayer.pdb" target="lib" />
+        <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
+        <file src="$BuildTmp$\bin\umbraco.editorControls.pdb" target="lib" />
+        <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
+        <file src="$BuildTmp$\bin\umbraco.MacroEngines.pdb" target="lib" />
+        <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
+        <file src="$BuildTmp$\bin\umbraco.providers.pdb" target="lib" />
+        <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
+        <file src="$BuildTmp$\bin\umbraco.pdb" target="lib" />
+        <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.UI.pdb" target="lib" />
+        <file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
+        <file src="$BuildTmp$\bin\UmbracoExamine.pdb" target="lib" />
+        <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
+    </files>
 </package>
@@ -1,54 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="3.4.4">
-    <id>UmbracoCms</id>
-    <version>7.0.0</version>
-    <title>Umbraco Cms</title>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
-    <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
-    <language>en-US</language>
-    <tags>umbraco</tags>
-    <dependencies>
-      <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.10, 4.0.0)" />
-      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
-      <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.0, 3.0.0)" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
-    <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
-    <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
-    <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
-    <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-    <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-    <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
-    <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
-    <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
-    <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
-    <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-    <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
-    <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
-    <file src="tools\install.ps1" target="tools\install.ps1" />
-    <file src="tools\Readme.txt" target="tools\Readme.txt" />
-    <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
-    <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
-    <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
-    <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
-    <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
-    <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
-    <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
-    <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
-    <file src="tools\processing.config.install.xdt" target="Content\Config\imageprocessor\processing.config.install.xdt" />
-    <file src="tools\cache.config.install.xdt" target="Content\Config\imageprocessor\cache.config.install.xdt" />
-    <file src="build\**" target="build" />
-  </files>
+    <metadata minClientVersion="3.4.4">
+        <id>UmbracoCms</id>
+        <version>7.0.0</version>
+        <title>Umbraco Cms</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+        <projectUrl>http://umbraco.com/</projectUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
+        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <dependencies>
+            <group targetFramework="net452">
+                <dependency id="UmbracoCms.Core" version="[$version$]" />
+                <dependency id="Newtonsoft.Json" version="[12.0.2, 13.0.0)" />
+                <dependency id="Umbraco.ModelsBuilder" version="[3.0.10, 4.0.0)" />
+                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.1, 3.0.0)" />
+                <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100, 3.0.0)" />
+                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1, 3.0.0)" />
+            </group>
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
+        <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
+        <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
+        <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
+        <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
+        <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
+        <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
+        <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
+        <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+        <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
+        <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
+        <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
+        <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
+        <file src="tools\install.ps1" target="tools\install.ps1" />
+        <file src="tools\Readme.txt" target="tools\Readme.txt" />
+        <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
+        <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
+        <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
+        <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
+        <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
+        <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
+        <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
+        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
+        <file src="tools\processing.config.install.xdt" target="Content\Config\imageprocessor\processing.config.install.xdt" />
+        <file src="tools\cache.config.install.xdt" target="Content\Config\imageprocessor\cache.config.install.xdt" />
+        <file src="build\**" target="build" />
+    </files>
 </package>
@@ -3,57 +3,57 @@
 [string]$Directory
 )
 $workingDirectory = $Directory
-CD $workingDirectory
+CD "$($workingDirectory)"

 # Clone repo
-$fullGitUrl = "https://$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
-git clone $fullGitUrl 2>&1 | % { $_.ToString() } 
+$fullGitUrl = "https://$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
+git clone $($fullGitUrl) $($env:GIT_REPOSITORYNAME) 2>&1 | % { $_.ToString() } 

 # Remove everything so that unzipping the release later will update everything
 # Don't remove the readme file nor the git directory
 Write-Host "Cleaning up git directory before adding new version"
-Remove-Item -Recurse $workingDirectory\$env:GIT_REPOSITORYNAME\* -Exclude README.md,.git
+Remove-Item -Recurse "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)\*" -Exclude README.md,.git

 # Find release zip
-$zipsDir = "$workingDirectory\$env:BUILD_DEFINITIONNAME\zips"
+$zipsDir = "$($workingDirectory)\$($env:BUILD_DEFINITIONNAME)\zips"
 $pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip"
-Write-Host "Searching for Umbraco release files in $workingDirectory\$zipsDir for a file with pattern $pattern"
-$file = (Get-ChildItem $zipsDir | Where-Object { $_.Name -match "$pattern" })
+Write-Host "Searching for Umbraco release files in $($zipsDir) for a file with pattern $($pattern)"
+$file = (Get-ChildItem "$($zipsDir)" | Where-Object { $_.Name -match "$($pattern)" })

 if($file)
 {
    # Get release name
-    $version = [regex]::Match($file.Name, $pattern).captures.groups[1].value
-    $releaseName = "Umbraco $version"
-    Write-Host "Found $releaseName"
+    $version = [regex]::Match($($file.Name), $($pattern)).captures.groups[1].value
+    $releaseName = "Umbraco $($version)"
+    Write-Host "Found $($releaseName)"
    
    # Unzip into repository to update release
    Add-Type -AssemblyName System.IO.Compression.FileSystem
-    Write-Host "Unzipping $($file.FullName) to $workingDirectory\$env:GIT_REPOSITORYNAME"
-    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$workingDirectory\$env:GIT_REPOSITORYNAME")
+    Write-Host "Unzipping $($file.FullName) to $($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)")
    
    # Telling git who we are
    git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() }
    git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() }
    
    # Commit
-    CD $env:GIT_REPOSITORYNAME
-    Write-Host "Committing Umbraco $version Release from Build Output"
+    CD "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
+    Write-Host "Committing Umbraco $($version) Release from Build Output"

    git add . 2>&1 | % { $_.ToString() } 
-    git commit -m " Release $releaseName from Build Output" 2>&1 | % { $_.ToString() } 
+    git commit -m " Release $($releaseName) from Build Output" 2>&1 | % { $_.ToString() } 

    # Tag the release
-    git tag -a "v$version" -m "v$version"
+    git tag -a "v$($version)" -m "v$($version)"

    # Push release to master
-    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$GitHubPersonalAccessToken@$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
-    git push $fullGitAuthUrl 2>&1 | % { $_.ToString() } 
+    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$($GitHubPersonalAccessToken)@$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
+    git push $($fullGitAuthUrl) 2>&1 | % { $_.ToString() } 

    #Push tag to master
-    git push $fullGitAuthUrl --tags 2>&1 | % { $_.ToString() }
+    git push $($fullGitAuthUrl) --tags 2>&1 | % { $_.ToString() }
 }
 else
 {
-    Write-Error "Umbraco release file not found, searched in $workingDirectory\$zipsDir for a file with pattern $pattern - cancelling"
+    Write-Error "Umbraco release file not found, searched in $($workingDirectory)\$($zipsDir) for a file with pattern $($pattern) - canceling"
 }
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>SQLCE4Umbraco</RootNamespace>
    <AssemblyName>SQLCE4Umbraco</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SccProjectName>
    </SccProjectName>
@@ -4,7 +4,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -16,19 +16,19 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
@@ -36,4 +36,4 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
@@ -11,5 +11,5 @@ using System.Resources;

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

-[assembly: AssemblyFileVersion("7.13.0")]
-[assembly: AssemblyInformationalVersion("7.13.0")]
+[assembly: AssemblyFileVersion("7.15.0")]
+[assembly: AssemblyInformationalVersion("7.15.0")]
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.13.0");
+        private static readonly Version Version = new Version("7.15.0");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -447,6 +447,11 @@ namespace Umbraco.Core
            /// </summary>
            public const string NestedContentAlias = "Umbraco.NestedContent";

+            /// <summary>
+            /// Alias for the multi url picker editor.
+            /// </summary>
+            public const string MultiUrlPickerAlias = "Umbraco.MultiUrlPicker";
+
            public static class PreValueKeys
            {
                /// <summary>
@@ -19,7 +19,7 @@ namespace Umbraco.Core.FileResources {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Files {
@@ -1,4 +1,6 @@
-using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
@@ -293,6 +295,12 @@ namespace Umbraco.Core.IO
        {
            var property = GetProperty(content, propertyTypeAlias);
            var svalue = property.Value as string;
+            if (svalue != null && svalue.DetectIsJson())
+            {
+                // the property value is a JSON serialized image crop data set - grab the "src" property as the file source
+                var jObject = JsonConvert.DeserializeObject<JObject>(svalue);
+                svalue = jObject != null ? jObject.GetValueAsString("src") : svalue;
+            }
            var oldpath = svalue == null ? null : GetRelativePath(svalue);
            var filepath = StoreFile(content, property.PropertyType, filename, filestream, oldpath);
            property.Value = GetUrl(filepath);
@@ -357,7 +365,8 @@ namespace Umbraco.Core.IO
            {
                var jpgInfo = ImageFile.FromStream(stream);

-                if (jpgInfo.Format != ImageFileFormat.Unknown
+                if (jpgInfo != null
+                    && jpgInfo.Format != ImageFileFormat.Unknown
                    && jpgInfo.Properties.ContainsKey(ExifTag.PixelYDimension)
                    && jpgInfo.Properties.ContainsKey(ExifTag.PixelXDimension))
                {
@@ -368,21 +377,28 @@ namespace Umbraco.Core.IO
                        return new Size(width, height);
                    }
                }
+            }
+            catch
+            {
+                //We will just swallow, just means we can't read exif data, we don't want to log an error either
+            }

-                //we have no choice but to try to read in via GDI
+            //we have no choice but to try to read in via GDI
+            try
+            {
                using (var image = Image.FromStream(stream))
                {
-
                    var fileWidth = image.Width;
                    var fileHeight = image.Height;
                    return new Size(fileWidth, fileHeight);
                }
            }
-            catch (Exception)
+            catch
            {
-                //We will just swallow, just means we can't read exif data, we don't want to log an error either
-                return new Size(Constants.Conventions.Media.DefaultSize, Constants.Conventions.Media.DefaultSize);
+                //We will just swallow, just means we can't read via GDI, we don't want to log an error either
            }
+
+            return new Size(Constants.Conventions.Media.DefaultSize, Constants.Conventions.Media.DefaultSize);
        }

        #endregion
@@ -118,9 +118,9 @@ namespace Umbraco.Core.Media.Exif
        /// <param name="encoding">The encoding to be used for text metadata when the source encoding is unknown.</param>
 		/// <returns>The <see cref="ImageFile"/> created from the file.</returns>
        public static ImageFile FromStream(Stream stream, Encoding encoding)
-		{
+        {
            // JPEG
-            if(JPEGDetector.IsOfType(stream))
+            if (JPEGDetector.IsOfType(stream))
            {
                return new JPEGFile(stream, encoding);
            }
@@ -137,8 +137,9 @@ namespace Umbraco.Core.Media.Exif
                return new SVGFile(stream);
            }

-            throw new NotValidImageFileException ();
-		}
+            // We don't know
+            return null;
+        }
 		#endregion
 	}
 }
@@ -7,8 +7,7 @@ namespace Umbraco.Core.Media.TypeDetector
        public static bool IsOfType(Stream fileStream)
        {
            var header = GetFileHeader(fileStream);
-
-            return header[0] == 0xff && header[1] == 0xD8;
+            return header != null && header[0] == 0xff && header[1] == 0xD8;
        }
    }
 }
@@ -7,9 +7,13 @@ namespace Umbraco.Core.Media.TypeDetector
        public static byte[] GetFileHeader(Stream fileStream)
        {
            fileStream.Seek(0, SeekOrigin.Begin);
-            byte[] header = new byte[8];
+            var header = new byte[8];
            fileStream.Seek(0, SeekOrigin.Begin);

+            // Invalid header
+            if (fileStream.Read(header, 0, header.Length) != header.Length)
+                return null;
+
            return header;
        }
    }
@@ -7,17 +7,17 @@ namespace Umbraco.Core.Media.TypeDetector
    {
        public static bool IsOfType(Stream fileStream)
        {
-            string tiffHeader = GetFileHeader(fileStream);
-
-            return tiffHeader == "MM\x00\x2a" || tiffHeader == "II\x2a\x00";
+            var tiffHeader = GetFileHeader(fileStream);
+            return tiffHeader != null && tiffHeader == "MM\x00\x2a" || tiffHeader == "II\x2a\x00";
        }

        public static string GetFileHeader(Stream fileStream)
        {
            var header = RasterizedTypeDetector.GetFileHeader(fileStream);
+            if (header == null)
+                return null;

-            string tiffHeader = Encoding.ASCII.GetString(header, 0, 4);
-
+            var tiffHeader = Encoding.ASCII.GetString(header, 0, 4);
            return tiffHeader;
        }
    }
@@ -25,6 +25,8 @@ namespace Umbraco.Core.Models.PublishedContent
        {
            Id = contentType.Id;
            Alias = contentType.Alias;
+            Name = contentType.Name;
+            Description = contentType.Description;
            _compositionAliases = new HashSet<string>(contentType.CompositionAliases(), StringComparer.InvariantCultureIgnoreCase);
            _propertyTypes = contentType.CompositionPropertyTypes
                .Select(x => new PublishedPropertyType(this, x))
@@ -33,10 +35,12 @@ namespace Umbraco.Core.Models.PublishedContent
        }

        // internal so it can be used for unit tests
-        internal PublishedContentType(int id, string alias, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
+        internal PublishedContentType(int id, string alias, string name, string description, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
        {
            Id = id;
            Alias = alias;
+            Name = name;
+            Description = description;
            _compositionAliases = new HashSet<string>(compositionAliases, StringComparer.InvariantCultureIgnoreCase);
            _propertyTypes = propertyTypes.ToArray();
            foreach (var propertyType in _propertyTypes)
@@ -46,7 +50,7 @@ namespace Umbraco.Core.Models.PublishedContent

        // create detached content type - ie does not match anything in the DB
        internal PublishedContentType(string alias, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
-            : this(0, alias, compositionAliases, propertyTypes)
+            : this(0, alias, string.Empty, string.Empty, compositionAliases, propertyTypes)
        { }

        private void InitializeIndexes()
@@ -63,6 +67,8 @@ namespace Umbraco.Core.Models.PublishedContent

        public int Id { get; private set; }
        public string Alias { get; private set; }
+        public string Name { get; private set; }
+        public string Description { get; private set; }
        public HashSet<string> CompositionAliases { get { return _compositionAliases; } }

        #endregion
@@ -0,0 +1,36 @@
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFourteenZero
+{
+    /// <summary>
+    /// Migrates member group picker properties from NVarchar to NText. See https://github.com/umbraco/Umbraco-CMS/issues/3268.
+    /// </summary>
+    [Migration("7.14.0", 1, Constants.System.UmbracoMigrationName)]
+    public class UpdateMemberGroupPickerData : MigrationBase
+    {
+        public UpdateMemberGroupPickerData(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            // move the data for all member group properties from the NVarchar to the NText column and clear the NVarchar column
+            Execute.Sql($@"UPDATE cmsPropertyData SET dataNtext = dataNvarchar, dataNvarchar = NULL
+                WHERE dataNtext IS NULL AND id IN (
+	                SELECT id FROM cmsPropertyData WHERE propertyTypeId in (
+		                SELECT id from cmsPropertyType where dataTypeID IN (
+			                SELECT nodeId FROM cmsDataType WHERE propertyEditorAlias = '{Constants.PropertyEditors.MemberGroupPickerAlias}'
+		                )
+	                )
+                )");
+
+            // ensure that all exising member group properties are defined as NText
+            Execute.Sql($"UPDATE cmsDataType SET dbType = 'Ntext' WHERE propertyEditorAlias = '{Constants.PropertyEditors.MemberGroupPickerAlias}'");
+        }
+
+        public override void Down()
+        {
+        }
+    }
+}
@@ -199,7 +199,7 @@ namespace Umbraco.Core.Persistence.Repositories
                               "DELETE FROM cmsContentXml WHERE nodeId = @Id",
                               "DELETE FROM cmsContent WHERE nodeId = @Id",
                               "DELETE FROM umbracoAccess WHERE nodeId = @Id",
-                               "DELETE FROM umbracoNode WHERE id = @Id"                               
+                               "DELETE FROM umbracoNode WHERE id = @Id"
                           };
            return list;
        }
@@ -468,7 +468,7 @@ namespace Umbraco.Core.Persistence.Repositories
            entity.Id = nodeDto.NodeId; //Set Id on entity to ensure an Id is set
            entity.Path = nodeDto.Path;
            entity.SortOrder = sortOrder;
-            entity.Level = level;            
+            entity.Level = level;

            //Create the Content specific data - cmsContent
            var contentDto = dto.ContentVersionDto.ContentDto;
@@ -644,7 +644,7 @@ namespace Umbraco.Core.Persistence.Repositories
                    contentVersionDto.Id = contentVerDto.Id;
                    Database.Update(contentVersionDto);
                }
-                
+
                Database.Update(dto);
            }

@@ -752,7 +752,7 @@ namespace Umbraco.Core.Persistence.Repositories
        public IEnumerable<IContent> GetBlueprints(IQuery<IContent> query)
        {
            Func<SqlTranslator<IContent>, Sql> translate = t => t.Translate();
-            
+
            var sqlFull = GetBaseQuery(BaseQueryType.FullMultiple);
            var translatorFull = new SqlTranslator<IContent>(sqlFull, query);
            var sqlIds = GetBaseQuery(BaseQueryType.Ids);
@@ -835,6 +835,61 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",

        }

+        public XmlDocument BuildPreviewXmlCache()
+        {
+            var xmlDoc = new XmlDocument();
+            var doctype = xmlDoc.CreateDocumentType("root", null, null,
+                ApplicationContext.Current.Services.ContentTypeService.GetContentTypesDtd());
+            xmlDoc.AppendChild(doctype);
+            var parent = xmlDoc.CreateElement("root");
+            var pIdAtt = xmlDoc.CreateAttribute("id");
+            pIdAtt.Value = "-1";
+            parent.Attributes.Append(pIdAtt);
+            xmlDoc.AppendChild(parent);
+
+            //Ensure that only nodes that have published versions are selected
+            var sql = string.Format(@"select umbracoNode.id, umbracoNode.parentID, umbracoNode.sortOrder, cmsPreviewXml.{0}, umbracoNode.{1} from umbracoNode
+inner join cmsPreviewXml on cmsPreviewXml.nodeId = umbracoNode.id and umbracoNode.nodeObjectType = @type
+inner join cmsDocument on cmsPreviewXml.versionId = cmsDocument.versionId and cmsDocument.newest=1
+order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
+                SqlSyntax.GetQuotedColumnName("xml"),
+                SqlSyntax.GetQuotedColumnName("level"),
+                SqlSyntax.GetQuotedColumnName("level"));
+
+            XmlElement last = null;
+
+            //NOTE: Query creates a reader - does not load all into memory
+            foreach (var row in Database.Query<dynamic>(sql, new { type = NodeObjectTypeId }))
+            {
+                string parentId = ((int)row.parentID).ToInvariantString();
+                string xml = row.xml;
+                int sortOrder = row.sortOrder;
+
+                //if the parentid is changing
+                if (last != null && last.GetAttribute("parentID") != parentId)
+                {
+                    parent = xmlDoc.GetElementById(parentId);
+                    if (parent == null)
+                    {
+                        //Need to short circuit here, if the parent is not there it means that the parent is unpublished
+                        // and therefore the child is not published either so cannot be included in the xml cache
+                        continue;
+                    }
+                }
+
+                var xmlDocFragment = xmlDoc.CreateDocumentFragment();
+                xmlDocFragment.InnerXml = xml;
+
+                last = (XmlElement)parent.AppendChild(xmlDocFragment);
+
+                // fix sortOrder - see notes in UpdateSortOrder
+                last.Attributes["sortOrder"].Value = sortOrder.ToInvariantString();
+            }
+
+            return xmlDoc;
+
+        }
+
        public int CountPublished(string contentTypeAlias = null)
        {
            if (contentTypeAlias.IsNullOrWhiteSpace())
@@ -868,9 +923,9 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
        /// </summary>
        /// <param name="entity"></param>
        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>        
+        /// <param name="groupIds"></param>
        public void AssignEntityPermission(IContent entity, char permission, IEnumerable<int> groupIds)
-        {            
+        {
            _permissionRepository.AssignEntityPermission(entity, permission, groupIds);
        }

@@ -882,7 +937,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
        public EntityPermissionCollection GetPermissionsForEntity(int entityId)
        {
            return _permissionRepository.GetPermissionsForEntity(entityId);
-        }        
+        }

        /// <summary>
        /// Adds/updates content/published xml
@@ -19,6 +19,8 @@ namespace Umbraco.Core.Persistence.Repositories
        /// <returns></returns>
        XmlDocument BuildXmlCache();

+        XmlDocument BuildPreviewXmlCache();
+
        /// <summary>
        /// Get the count of published items
        /// </summary>
@@ -96,4 +98,4 @@ namespace Umbraco.Core.Persistence.Repositories
        /// <param name="xml"></param>
        void AddOrUpdatePreviewXml(IContent content, Func<IContent, XElement> xml);
    }
-}
+}
@@ -95,7 +95,9 @@ namespace Umbraco.Core.Persistence.Repositories
                .InnerJoin<ContentDto>(SqlSyntax)
                .On<ContentVersionDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                .InnerJoin<NodeDto>(SqlSyntax)
-                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId);
+                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentTypeDto>(SqlSyntax)
+                .On<ContentTypeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.ContentTypeId);

            if (includeFilePaths)
            {
@@ -267,8 +267,8 @@ ORDER BY colName";

            var fromDate = DateTime.UtcNow - timespan;

-            var count = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoUserLogin WHERE lastValidatedUtc=@fromDate", new { fromDate = fromDate });
-            Database.Execute("DELETE FROM umbracoUserLogin WHERE lastValidatedUtc=@fromDate", new { fromDate = fromDate });
+            var count = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoUserLogin WHERE lastValidatedUtc<=@fromDate", new { fromDate = fromDate });
+            Database.Execute("DELETE FROM umbracoUserLogin WHERE lastValidatedUtc<=@fromDate", new { fromDate = fromDate });
            return count;
        }

@@ -703,6 +703,8 @@ ORDER BY contentNodeId, versionId, propertytypeid
                // Members only
                case "USERNAME":
                    return "cmsMember.LoginName";
+                case "CONTENTTYPEALIAS":
+                    return "cmsContentType.alias";
                default:
                    //ensure invalid SQL cannot be submitted
                    return Regex.Replace(orderBy, @"[^\w\.,`\[\]@-]", "");
@@ -53,6 +53,12 @@ namespace Umbraco.Core.PropertyEditors
                nestedContentEditorFromPackage.Name = "(Obsolete) " + nestedContentEditorFromPackage.Name;
                nestedContentEditorFromPackage.IsDeprecated = true;
            }
+            var multiUrlPickerEditorFromPackage = editors.FirstOrDefault(x => x.Alias == "RJP.MultiUrlPicker");
+            if (multiUrlPickerEditorFromPackage != null)
+            {
+                multiUrlPickerEditorFromPackage.Name = "(Obsolete) " + multiUrlPickerEditorFromPackage.Name;
+                multiUrlPickerEditorFromPackage.IsDeprecated = true;
+            }
            return editors;

        }
@@ -42,16 +42,22 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters

        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
        {
+            var sourceAsString = source?.ToString();
+            if(sourceAsString.IsNullOrWhiteSpace())
+            {
+                return new string[0];
+            }
+
            // if Json storage type deserialzie and return as string array
            if (JsonStorageType(propertyType.DataTypeId))
            {
-                var jArray = JsonConvert.DeserializeObject<JArray>(source.ToString());
+                var jArray = JsonConvert.DeserializeObject<JArray>(sourceAsString);
                return jArray.ToObject<string[]>();
            }

            // Otherwise assume CSV storage type and return as string array
            var csvTags =
-                source.ToString()
+                sourceAsString
                    .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
                    .ToArray();
            return csvTags;
@@ -107,6 +107,11 @@ namespace Umbraco.Core.Security

            await EnsureValidSessionId(context);

+            if (context?.Identity == null)
+            {
+                context?.OwinContext.Authentication.SignOut(context.Options.AuthenticationType);
+                return;
+            }
            await base.ValidateIdentity(context);
        }        

@@ -1741,7 +1741,15 @@ namespace Umbraco.Core.Services
        /// <summary>
        /// Empties the Recycle Bin by deleting all <see cref="IContent"/> that resides in the bin
        /// </summary>
-        public void EmptyRecycleBin()
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use EmptyRecycleBin with explicit indication of user ID instead")]
+        public void EmptyRecycleBin() => EmptyRecycleBin(0);
+
+        /// <summary>
+        /// Empties the Recycle Bin by deleting all <see cref="IContent"/> that resides in the bin
+        /// </summary>
+        /// <param name="userId">Optional Id of the User emptying the Recycle Bin</param>        
+        public void EmptyRecycleBin(int userId = 0)
        {
            using (new WriteLock(Locker))
            {
@@ -1771,7 +1779,7 @@ namespace Umbraco.Core.Services
                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);

-                    Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", 0, Constants.System.RecycleBinContent);
+                    Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", userId, Constants.System.RecycleBinContent);
                    uow.Commit();
                }
            }
@@ -2192,6 +2200,17 @@ namespace Umbraco.Core.Services
            }
        }

+        public XmlDocument BuildPreviewXmlCache()
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentRepository(uow);
+                var result = repository.BuildPreviewXmlCache();
+                uow.Commit();
+                return result;
+            }
+        }
+
        /// <summary>
        /// Rebuilds all xml content in the cmsContentXml table for all documents
        /// </summary>
@@ -124,6 +124,8 @@ namespace Umbraco.Core.Services
        /// <returns></returns>
        XmlDocument BuildXmlCache();

+        XmlDocument BuildPreviewXmlCache();
+
        /// <summary>
        /// Rebuilds all xml content in the cmsContentXml table for all documents
        /// </summary>
@@ -438,8 +440,16 @@ namespace Umbraco.Core.Services
        /// <summary>
        /// Empties the Recycle Bin by deleting all <see cref="IContent"/> that resides in the bin
        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use EmptyRecycleBin with explicit indication of user ID instead")]
        void EmptyRecycleBin();

+        /// <summary>
+        /// Empties the Recycle Bin by deleting all <see cref="IContent"/> that resides in the bin
+        /// </summary>
+        /// <param name="userId">Optional Id of the User emptying the Recycle Bin</param>        
+        void EmptyRecycleBin(int userId = 0);
+
        /// <summary>
        /// Rollback an <see cref="IContent"/> object to a previous version.
        /// This will create a new version, which is a copy of all the old data.
@@ -289,8 +289,16 @@ namespace Umbraco.Core.Services
        /// <summary>
        /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use EmptyRecycleBin with explicit indication of user ID instead")]
        void EmptyRecycleBin();

+        /// <summary>
+        /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
+        /// </summary>
+        /// <param name="userId">Optional Id of the User emptying the Recycle Bin</param>        
+        void EmptyRecycleBin(int userId = 0);
+
        /// <summary>
        /// Deletes all media of specified type. All children of deleted media is moved to Recycle Bin.
        /// </summary>
@@ -509,7 +509,7 @@ namespace Umbraco.Core.Services
        public IEnumerable<IMedia> GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren,
            string orderBy, Direction orderDirection, bool orderBySystemField, string filter)
        {
-            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filter, null);
+            return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter, null);
        }

        /// <summary>
@@ -981,7 +981,15 @@ namespace Umbraco.Core.Services
        /// <summary>
        /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
        /// </summary>
-        public void EmptyRecycleBin()
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use EmptyRecycleBin with explicit indication of user ID instead")]
+        public void EmptyRecycleBin() => EmptyRecycleBin(0);
+
+        /// <summary>
+        /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
+        /// </summary>
+        /// <param name="userId">Optional Id of the User emptying the Recycle Bin</param>        
+        public void EmptyRecycleBin(int userId = 0)
        {
            using (new WriteLock(Locker))
            {
@@ -1006,7 +1014,7 @@ namespace Umbraco.Core.Services
                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);

-                    Audit(uow, AuditType.Delete, "Empty Media Recycle Bin performed by user", 0, Constants.System.RecycleBinMedia);
+                    Audit(uow, AuditType.Delete, "Empty Media Recycle Bin performed by user", userId, Constants.System.RecycleBinMedia);
                    uow.Commit();
                }
            }
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
@@ -69,6 +70,11 @@ namespace Umbraco.Core.Services

        public void Save(IMemberGroup memberGroup, bool raiseEvents = true)
        {
+            if (string.IsNullOrWhiteSpace(memberGroup.Name))
+            {
+                throw new InvalidOperationException("The name of a MemberGroup can not be empty");
+            }
+
            using (var uow = UowProvider.GetUnitOfWork())
            {
                var saveEventArgs = new SaveEventArgs<IMemberGroup>(memberGroup);
@@ -133,4 +139,4 @@ namespace Umbraco.Core.Services
        /// </remarks>
        public static event TypedEventHandler<IMemberGroupService, SaveEventArgs<IMemberGroup>> Saved;
    }
-}
+}
@@ -189,7 +189,6 @@ namespace Umbraco.Core
                outputArray[i] = char.IsLetterOrDigit(inputArray[i]) ? inputArray[i] : replacement;
            return new string(outputArray);
        }
-
        private static readonly char[] CleanForXssChars = "*?(){}[];:%<>/\\|&'\"".ToCharArray();

        /// <summary>
@@ -542,7 +541,7 @@ namespace Umbraco.Core
        public static string StripHtml(this string text)
        {
            const string pattern = @"<(.|\n)*?>";
-            return Regex.Replace(text, pattern, String.Empty);
+            return Regex.Replace(text, pattern, string.Empty);
        }

        /// <summary>
@@ -732,6 +731,7 @@ namespace Umbraco.Core
        /// </summary>
        /// <param name="stringToConvert">Referrs to itself</param>
        /// <returns>The MD5 hashed string</returns>
+        [Obsolete("Please use the GenerateHash method instead. This may be removed in future versions")]
        public static string ToMd5(this string stringToConvert)
        {
            return stringToConvert.GenerateHash("MD5");
@@ -742,6 +742,7 @@ namespace Umbraco.Core
        /// </summary>
        /// <param name="stringToConvert">referrs to itself</param>
        /// <returns>The SHA1 hashed string</returns>
+        [Obsolete("Please use the GenerateHash method instead. This may be removed in future versions")]
        public static string ToSHA1(this string stringToConvert)
        {
            return stringToConvert.GenerateHash("SHA1");
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Umbraco.Core</RootNamespace>
    <AssemblyName>Umbraco.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
@@ -48,11 +48,11 @@
    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
    </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="HtmlAgilityPack, Version=1.8.8.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.8\lib\Net45\HtmlAgilityPack.dll</HintPath>
    </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
    </Reference>
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
@@ -61,22 +61,22 @@
      <HintPath>..\packages\Log4Net.Async.2.0.4\lib\net40\Log4Net.Async.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Security, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Security.Cookies, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.1.0\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
    </Reference>
    <Reference Include="MiniProfiler, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
@@ -85,14 +85,14 @@
      <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
    </Reference>
    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
+      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.Composition" />
@@ -115,8 +115,8 @@
    <Reference Include="System.Runtime.Caching" />
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
    </Reference>
    <Reference Include="System.Web" />
    <Reference Include="System.Web.ApplicationServices" />
@@ -572,6 +572,7 @@
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddInstructionCountColumn.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddCmsMediaTable.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddUserLoginTable.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFourteenZero\UpdateMemberGroupPickerData.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\RenameTrueFalseField.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\SetDefaultTagsStorageType.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenNineZero\AddUmbracoAuditTable.cs" />
@@ -1,323 +1,323 @@
-using System;
-using System.IO;
-using System.Linq;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides extension methods to <see cref="Uri"/>.
-    /// </summary>
-    public static class UriExtensions
-    {
-        /// <summary>
-        /// Checks if the current uri is a back office request
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="applicationPath">
-        /// The current application path or VirtualPath
-        /// </param>
-        /// <returns></returns>
-        /// <remarks>
-        /// There are some special routes we need to check to properly determine this:
-        /// 
-        ///     If any route has an extension in the path like .aspx = back office
-        /// 
-        ///     These are def back office:
-        ///         /Umbraco/RestServices   = back office
-        ///         /Umbraco/BackOffice     = back office
-        ///     If it's not any of the above, and there's no extension then we cannot determine if it's back office or front-end
-        ///     so we can only assume that it is not back office. This will occur if people use an UmbracoApiController for the backoffice
-        ///     but do not inherit from UmbracoAuthorizedApiController and do not use [IsBackOffice] attribute.
-        /// 
-        ///     These are def front-end: 
-        ///         /Umbraco/Surface        = front-end
-        ///         /Umbraco/Api            = front-end
-        ///     But if we've got this far we'll just have to assume it's front-end anyways.
-        /// 
-        /// </remarks>
-        internal static bool IsBackOfficeRequest(this Uri url, string applicationPath)
-        {
-            applicationPath = applicationPath ?? string.Empty;
-
-            var fullUrlPath = url.AbsolutePath.TrimStart(new[] {'/'});
-            var appPath = applicationPath.TrimStart(new[] {'/'});
-            var urlPath = fullUrlPath.TrimStart(appPath).EnsureStartsWith('/');
-            
-            //check if this is in the umbraco back office
-            var isUmbracoPath = urlPath.InvariantStartsWith(GlobalSettings.Path.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
-            //if not, then def not back office
-            if (isUmbracoPath == false) return false;
-
-            //if its the normal /umbraco path
-            if (urlPath.InvariantEquals("/" + GlobalSettings.UmbracoMvcArea)
-                || urlPath.InvariantEquals("/" + GlobalSettings.UmbracoMvcArea + "/"))
-            {
-                return true;
-            }
-
-            //check for a file extension
-            var extension = Path.GetExtension(url.LocalPath);
-            //has an extension, def back office
-            if (extension.IsNullOrWhiteSpace() == false) return true;
-            //check for special case asp.net calls like:
-            //  /umbraco/webservices/legacyAjaxCalls.asmx/js which will return a null file extension but are still considered extension'd requests
-            if (urlPath.InvariantContains(".asmx/")
-                || urlPath.InvariantContains(".aspx/")
-                || urlPath.InvariantContains(".ashx/")
-                || urlPath.InvariantContains(".axd/")
-                || urlPath.InvariantContains(".svc/"))
-            {
-                return true;
-            }
-
-            //check for special back office paths
-            if (urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/BackOffice/")
-                || urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/RestServices/"))
-            {
-                return true;
-            }
-
-            //check for special front-end paths
-            if (urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/Surface/")
-                || urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/Api/"))
-            {
-                return false;
-            }
-
-            //if its none of the above, we will have to try to detect if it's a PluginController route, we can detect this by 
-            // checking how many parts the route has, for example, all PluginController routes will be routed like
-            // Umbraco/MYPLUGINAREA/MYCONTROLLERNAME/{action}/{id}
-            // so if the path contains at a minimum 3 parts: Umbraco + MYPLUGINAREA + MYCONTROLLERNAME then we will have to assume it is a 
-            // plugin controller for the front-end.
-            if (urlPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries).Length >= 3)
-            {
-                return false;
-            }
-
-            //if its anything else we can assume it's back office
-            return true;
-        }
-
-        /// <summary>
-        /// Checks if the current uri is an install request
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        internal static bool IsInstallerRequest(this Uri url)
-        {
-            var authority = url.GetLeftPart(UriPartial.Authority);
-            var afterAuthority = url.GetLeftPart(UriPartial.Query)
-                                    .TrimStart(authority)
-                                    .TrimStart("/");
-
-            //check if this is in the umbraco back office
-            return afterAuthority.InvariantStartsWith(IOHelper.ResolveUrl("~/install").TrimStart("/"));
-        }
-
-        /// <summary>
-        /// Checks if the uri is a request for the default back office page
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        internal static bool IsDefaultBackOfficeRequest(this Uri url)
-        {
-            if (url.AbsolutePath.InvariantEquals(GlobalSettings.Path.TrimEnd("/"))
-                || url.AbsolutePath.InvariantEquals(GlobalSettings.Path.EnsureEndsWith('/'))
-                || url.AbsolutePath.InvariantEquals(GlobalSettings.Path.EnsureEndsWith('/') + "Default")
-                || url.AbsolutePath.InvariantEquals(GlobalSettings.Path.EnsureEndsWith('/') + "Default/"))
-            {
-                return true;
-            }
-            return false;
-        }
-        
-        /// <summary>
-        /// This is a performance tweak to check if this not an ASP.Net server file
-        /// .Net will pass these requests through to the module when in integrated mode.
-        /// We want to ignore all of these requests immediately.
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        internal static bool IsClientSideRequest(this Uri url)
-        {
-            try
-            {
-                var ext = Path.GetExtension(url.LocalPath);
-                if (ext.IsNullOrWhiteSpace()) return false;
-                var toInclude = new[] {".aspx", ".ashx", ".asmx", ".axd", ".svc"};
-                return toInclude.Any(ext.InvariantEquals) == false;
-            }
-            catch (ArgumentException ex)
-            {
-                LogHelper.Error(typeof(UriExtensions), "Failed to determine if request was client side", ex);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Rewrites the path of uri.
-        /// </summary>
-        /// <param name="uri">The uri.</param>
-        /// <param name="path">The new path, which must begin with a slash.</param>
-        /// <returns>The rewritten uri.</returns>
-        /// <remarks>Everything else remains unchanged, except for the fragment which is removed.</remarks>
-        public static Uri Rewrite(this Uri uri, string path)
-        {
-            if (path.StartsWith("/") == false)
-                throw new ArgumentException("Path must start with a slash.", "path");
-
-            return uri.IsAbsoluteUri
-                ? new Uri(uri.GetLeftPart(UriPartial.Authority) + path + uri.Query)
-                : new Uri(path + uri.GetSafeQuery(), UriKind.Relative);
-        }
-
-        /// <summary>
-        /// Rewrites the path and query of a uri.
-        /// </summary>
-        /// <param name="uri">The uri.</param>
-        /// <param name="path">The new path, which must begin with a slash.</param>
-        /// <param name="query">The new query, which must be empty or begin with a question mark.</param>
-        /// <returns>The rewritten uri.</returns>
-        /// <remarks>Everything else remains unchanged, except for the fragment which is removed.</remarks>
-        public static Uri Rewrite(this Uri uri, string path, string query)
-        {
-            if (path.StartsWith("/") == false)
-                throw new ArgumentException("Path must start with a slash.", "path");
-            if (query.Length > 0 && query.StartsWith("?") == false)
-                throw new ArgumentException("Query must start with a question mark.", "query");
-            if (query == "?")
-                query = "";
-
-            return uri.IsAbsoluteUri
-                ? new Uri(uri.GetLeftPart(UriPartial.Authority) + path + query)
-                : new Uri(path + query, UriKind.Relative);
-        }
-
-        /// <summary>
-        /// Gets the absolute path of the uri, even if the uri is relative.
-        /// </summary>
-        /// <param name="uri">The uri.</param>
-        /// <returns>The absolute path of the uri.</returns>
-        /// <remarks>Default uri.AbsolutePath does not support relative uris.</remarks>
-        public static string GetSafeAbsolutePath(this Uri uri)
-        {
-            if (uri.IsAbsoluteUri)
-                return uri.AbsolutePath;
-
-            // cannot get .AbsolutePath on relative uri (InvalidOperation)
-            var s = uri.OriginalString;
-            var posq = s.IndexOf("?", StringComparison.Ordinal);
-            var posf = s.IndexOf("#", StringComparison.Ordinal);
-            var pos = posq > 0 ? posq : (posf > 0 ? posf : 0);
-            var path = pos > 0 ? s.Substring(0, pos) : s;
-            return path;
-        }
-
-        /// <summary>
-        /// Gets the decoded, absolute path of the uri.
-        /// </summary>
-        /// <param name="uri">The uri.</param>
-        /// <returns>The absolute path of the uri.</returns>
-        /// <remarks>Only for absolute uris.</remarks>
-        public static string GetAbsolutePathDecoded(this Uri uri)
-        {
-            return System.Web.HttpUtility.UrlDecode(uri.AbsolutePath);
-        }
-
-        /// <summary>
-        /// Gets the decoded, absolute path of the uri, even if the uri is relative.
-        /// </summary>
-        /// <param name="uri">The uri.</param>
-        /// <returns>The absolute path of the uri.</returns>
-        /// <remarks>Default uri.AbsolutePath does not support relative uris.</remarks>
-        public static string GetSafeAbsolutePathDecoded(this Uri uri)
-        {
-            return System.Web.HttpUtility.UrlDecode(uri.GetSafeAbsolutePath());
-        }
-
-        /// <summary>
-        /// Rewrites the path of the uri so it ends with a slash.
-        /// </summary>
-        /// <param name="uri">The uri.</param>
-        /// <returns>The rewritten uri.</returns>
-        /// <remarks>Everything else remains unchanged.</remarks>
-        public static Uri EndPathWithSlash(this Uri uri)
-        {
-            var path = uri.GetSafeAbsolutePath();
-            if (uri.IsAbsoluteUri)
-            {
-				if (path != "/" && path.EndsWith("/") == false)
-                    uri = new Uri(uri.GetLeftPart(UriPartial.Authority) + path + "/" + uri.Query);
-                return uri;
-            }
-		    
-            if (path != "/" && path.EndsWith("/") == false)
-					uri = new Uri(path + "/" + uri.Query, UriKind.Relative);
-		    
-            return uri;
-        }
-
-        /// <summary>
-        /// Rewrites the path of the uri so it does not end with a slash.
-        /// </summary>
-        /// <param name="uri">The uri.</param>
-        /// <returns>The rewritten uri.</returns>
-        /// <remarks>Everything else remains unchanged.</remarks>
-        public static Uri TrimPathEndSlash(this Uri uri)
-        {
-            var path = uri.GetSafeAbsolutePath();
-            if (uri.IsAbsoluteUri)
-            {
-                if (path != "/")
-                    uri = new Uri(uri.GetLeftPart(UriPartial.Authority) + path.TrimEnd('/') + uri.Query);
-            }
-            else
-            {
-                if (path != "/")
-                    uri = new Uri(path.TrimEnd('/') + uri.Query, UriKind.Relative);
-            }
-            return uri;
-        }
-
-        /// <summary>
-        /// Transforms a relative uri into an absolute uri.
-        /// </summary>
-        /// <param name="uri">The relative uri.</param>
-        /// <param name="baseUri">The base absolute uri.</param>
-        /// <returns>The absolute uri.</returns>
-        public static Uri MakeAbsolute(this Uri uri, Uri baseUri)
-        {
-            if (uri.IsAbsoluteUri)
-                throw new ArgumentException("Uri is already absolute.", "uri");
-
-            return new Uri(baseUri.GetLeftPart(UriPartial.Authority) + uri.GetSafeAbsolutePath() + uri.GetSafeQuery());
-        }
-
-        static string GetSafeQuery(this Uri uri)
-        {
-            if (uri.IsAbsoluteUri)
-                return uri.Query;
-
-            // cannot get .Query on relative uri (InvalidOperation)
-            var s = uri.OriginalString;
-            var posq = s.IndexOf("?", StringComparison.Ordinal);
-            var posf = s.IndexOf("#", StringComparison.Ordinal);
-            var query = posq < 0 ? null : (posf < 0 ? s.Substring(posq) : s.Substring(posq, posf - posq));
-
-            return query;
-        }
-
-        /// <summary>
-        /// Removes the port from the uri.
-        /// </summary>
-        /// <param name="uri">The uri.</param>
-        /// <returns>The same uri, without its port.</returns>
-        public static Uri WithoutPort(this Uri uri)
-        {
-            return new Uri(uri.GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped));
-        }
-    }
-}
+using System;
+using System.IO;
+using System.Linq;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides extension methods to <see cref="Uri"/>.
+    /// </summary>
+    public static class UriExtensions
+    {
+        /// <summary>
+        /// Checks if the current uri is a back office request
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="applicationPath">
+        /// The current application path or VirtualPath
+        /// </param>
+        /// <returns></returns>
+        /// <remarks>
+        /// There are some special routes we need to check to properly determine this:
+        /// 
+        ///     If any route has an extension in the path like .aspx = back office
+        /// 
+        ///     These are def back office:
+        ///         /Umbraco/RestServices   = back office
+        ///         /Umbraco/BackOffice     = back office
+        ///     If it's not any of the above, and there's no extension then we cannot determine if it's back office or front-end
+        ///     so we can only assume that it is not back office. This will occur if people use an UmbracoApiController for the backoffice
+        ///     but do not inherit from UmbracoAuthorizedApiController and do not use [IsBackOffice] attribute.
+        /// 
+        ///     These are def front-end: 
+        ///         /Umbraco/Surface        = front-end
+        ///         /Umbraco/Api            = front-end
+        ///     But if we've got this far we'll just have to assume it's front-end anyways.
+        /// 
+        /// </remarks>
+        internal static bool IsBackOfficeRequest(this Uri url, string applicationPath)
+        {
+            applicationPath = applicationPath ?? string.Empty;
+
+            var fullUrlPath = url.AbsolutePath.TrimStart(new[] {'/'});
+            var appPath = applicationPath.TrimStart(new[] {'/'});
+            var urlPath = fullUrlPath.TrimStart(appPath).EnsureStartsWith('/');
+            
+            //check if this is in the umbraco back office
+            var isUmbracoPath = urlPath.InvariantStartsWith(GlobalSettings.Path.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
+            //if not, then def not back office
+            if (isUmbracoPath == false) return false;
+
+            //if its the normal /umbraco path
+            if (urlPath.InvariantEquals("/" + GlobalSettings.UmbracoMvcArea)
+                || urlPath.InvariantEquals("/" + GlobalSettings.UmbracoMvcArea + "/"))
+            {
+                return true;
+            }
+
+            //check for a file extension
+            var extension = Path.GetExtension(url.LocalPath);
+            //has an extension, def back office
+            if (extension.IsNullOrWhiteSpace() == false) return true;
+            //check for special case asp.net calls like:
+            //  /umbraco/webservices/legacyAjaxCalls.asmx/js which will return a null file extension but are still considered extension'd requests
+            if (urlPath.InvariantContains(".asmx/")
+                || urlPath.InvariantContains(".aspx/")
+                || urlPath.InvariantContains(".ashx/")
+                || urlPath.InvariantContains(".axd/")
+                || urlPath.InvariantContains(".svc/"))
+            {
+                return true;
+            }
+
+            //check for special back office paths
+            if (urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/BackOffice/")
+                || urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/RestServices/"))
+            {
+                return true;
+            }
+
+            //check for special front-end paths
+            if (urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/Surface/")
+                || urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/Api/"))
+            {
+                return false;
+            }
+
+            //if its none of the above, we will have to try to detect if it's a PluginController route, we can detect this by 
+            // checking how many parts the route has, for example, all PluginController routes will be routed like
+            // Umbraco/MYPLUGINAREA/MYCONTROLLERNAME/{action}/{id}
+            // so if the path contains at a minimum 3 parts: Umbraco + MYPLUGINAREA + MYCONTROLLERNAME then we will have to assume it is a 
+            // plugin controller for the front-end.
+            if (urlPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries).Length >= 3)
+            {
+                return false;
+            }
+
+            //if its anything else we can assume it's back office
+            return true;
+        }
+
+        /// <summary>
+        /// Checks if the current uri is an install request
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        internal static bool IsInstallerRequest(this Uri url)
+        {
+            var authority = url.GetLeftPart(UriPartial.Authority);
+            var afterAuthority = url.GetLeftPart(UriPartial.Query)
+                                    .TrimStart(authority)
+                                    .TrimStart("/");
+
+            //check if this is in the umbraco back office
+            return afterAuthority.InvariantStartsWith(IOHelper.ResolveUrl("~/install").TrimStart("/"));
+        }
+
+        /// <summary>
+        /// Checks if the uri is a request for the default back office page
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        internal static bool IsDefaultBackOfficeRequest(this Uri url)
+        {
+            if (url.AbsolutePath.InvariantEquals(GlobalSettings.Path.TrimEnd("/"))
+                || url.AbsolutePath.InvariantEquals(GlobalSettings.Path.EnsureEndsWith('/'))
+                || url.AbsolutePath.InvariantEquals(GlobalSettings.Path.EnsureEndsWith('/') + "Default")
+                || url.AbsolutePath.InvariantEquals(GlobalSettings.Path.EnsureEndsWith('/') + "Default/"))
+            {
+                return true;
+            }
+            return false;
+        }
+        
+        /// <summary>
+        /// This is a performance tweak to check if this not an ASP.Net server file
+        /// .Net will pass these requests through to the module when in integrated mode.
+        /// We want to ignore all of these requests immediately.
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        internal static bool IsClientSideRequest(this Uri url)
+        {
+            try
+            {
+                var ext = Path.GetExtension(url.LocalPath);
+                if (ext.IsNullOrWhiteSpace()) return false;
+                var toInclude = new[] {".aspx", ".ashx", ".asmx", ".axd", ".svc"};
+                return toInclude.Any(ext.InvariantEquals) == false;
+            }
+            catch (ArgumentException)
+            {
+                LogHelper.Debug(typeof(UriExtensions), "Failed to determine if request was client side. Due to invalid characters in path: {0}", () => url.LocalPath);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Rewrites the path of uri.
+        /// </summary>
+        /// <param name="uri">The uri.</param>
+        /// <param name="path">The new path, which must begin with a slash.</param>
+        /// <returns>The rewritten uri.</returns>
+        /// <remarks>Everything else remains unchanged, except for the fragment which is removed.</remarks>
+        public static Uri Rewrite(this Uri uri, string path)
+        {
+            if (path.StartsWith("/") == false)
+                throw new ArgumentException("Path must start with a slash.", "path");
+
+            return uri.IsAbsoluteUri
+                ? new Uri(uri.GetLeftPart(UriPartial.Authority) + path + uri.Query)
+                : new Uri(path + uri.GetSafeQuery(), UriKind.Relative);
+        }
+
+        /// <summary>
+        /// Rewrites the path and query of a uri.
+        /// </summary>
+        /// <param name="uri">The uri.</param>
+        /// <param name="path">The new path, which must begin with a slash.</param>
+        /// <param name="query">The new query, which must be empty or begin with a question mark.</param>
+        /// <returns>The rewritten uri.</returns>
+        /// <remarks>Everything else remains unchanged, except for the fragment which is removed.</remarks>
+        public static Uri Rewrite(this Uri uri, string path, string query)
+        {
+            if (path.StartsWith("/") == false)
+                throw new ArgumentException("Path must start with a slash.", "path");
+            if (query.Length > 0 && query.StartsWith("?") == false)
+                throw new ArgumentException("Query must start with a question mark.", "query");
+            if (query == "?")
+                query = "";
+
+            return uri.IsAbsoluteUri
+                ? new Uri(uri.GetLeftPart(UriPartial.Authority) + path + query)
+                : new Uri(path + query, UriKind.Relative);
+        }
+
+        /// <summary>
+        /// Gets the absolute path of the uri, even if the uri is relative.
+        /// </summary>
+        /// <param name="uri">The uri.</param>
+        /// <returns>The absolute path of the uri.</returns>
+        /// <remarks>Default uri.AbsolutePath does not support relative uris.</remarks>
+        public static string GetSafeAbsolutePath(this Uri uri)
+        {
+            if (uri.IsAbsoluteUri)
+                return uri.AbsolutePath;
+
+            // cannot get .AbsolutePath on relative uri (InvalidOperation)
+            var s = uri.OriginalString;
+            var posq = s.IndexOf("?", StringComparison.Ordinal);
+            var posf = s.IndexOf("#", StringComparison.Ordinal);
+            var pos = posq > 0 ? posq : (posf > 0 ? posf : 0);
+            var path = pos > 0 ? s.Substring(0, pos) : s;
+            return path;
+        }
+
+        /// <summary>
+        /// Gets the decoded, absolute path of the uri.
+        /// </summary>
+        /// <param name="uri">The uri.</param>
+        /// <returns>The absolute path of the uri.</returns>
+        /// <remarks>Only for absolute uris.</remarks>
+        public static string GetAbsolutePathDecoded(this Uri uri)
+        {
+            return System.Web.HttpUtility.UrlDecode(uri.AbsolutePath);
+        }
+
+        /// <summary>
+        /// Gets the decoded, absolute path of the uri, even if the uri is relative.
+        /// </summary>
+        /// <param name="uri">The uri.</param>
+        /// <returns>The absolute path of the uri.</returns>
+        /// <remarks>Default uri.AbsolutePath does not support relative uris.</remarks>
+        public static string GetSafeAbsolutePathDecoded(this Uri uri)
+        {
+            return System.Web.HttpUtility.UrlDecode(uri.GetSafeAbsolutePath());
+        }
+
+        /// <summary>
+        /// Rewrites the path of the uri so it ends with a slash.
+        /// </summary>
+        /// <param name="uri">The uri.</param>
+        /// <returns>The rewritten uri.</returns>
+        /// <remarks>Everything else remains unchanged.</remarks>
+        public static Uri EndPathWithSlash(this Uri uri)
+        {
+            var path = uri.GetSafeAbsolutePath();
+            if (uri.IsAbsoluteUri)
+            {
+				if (path != "/" && path.EndsWith("/") == false)
+                    uri = new Uri(uri.GetLeftPart(UriPartial.Authority) + path + "/" + uri.Query);
+                return uri;
+            }
+		    
+            if (path != "/" && path.EndsWith("/") == false)
+					uri = new Uri(path + "/" + uri.Query, UriKind.Relative);
+		    
+            return uri;
+        }
+
+        /// <summary>
+        /// Rewrites the path of the uri so it does not end with a slash.
+        /// </summary>
+        /// <param name="uri">The uri.</param>
+        /// <returns>The rewritten uri.</returns>
+        /// <remarks>Everything else remains unchanged.</remarks>
+        public static Uri TrimPathEndSlash(this Uri uri)
+        {
+            var path = uri.GetSafeAbsolutePath();
+            if (uri.IsAbsoluteUri)
+            {
+                if (path != "/")
+                    uri = new Uri(uri.GetLeftPart(UriPartial.Authority) + path.TrimEnd('/') + uri.Query);
+            }
+            else
+            {
+                if (path != "/")
+                    uri = new Uri(path.TrimEnd('/') + uri.Query, UriKind.Relative);
+            }
+            return uri;
+        }
+
+        /// <summary>
+        /// Transforms a relative uri into an absolute uri.
+        /// </summary>
+        /// <param name="uri">The relative uri.</param>
+        /// <param name="baseUri">The base absolute uri.</param>
+        /// <returns>The absolute uri.</returns>
+        public static Uri MakeAbsolute(this Uri uri, Uri baseUri)
+        {
+            if (uri.IsAbsoluteUri)
+                throw new ArgumentException("Uri is already absolute.", "uri");
+
+            return new Uri(baseUri.GetLeftPart(UriPartial.Authority) + uri.GetSafeAbsolutePath() + uri.GetSafeQuery());
+        }
+
+        static string GetSafeQuery(this Uri uri)
+        {
+            if (uri.IsAbsoluteUri)
+                return uri.Query;
+
+            // cannot get .Query on relative uri (InvalidOperation)
+            var s = uri.OriginalString;
+            var posq = s.IndexOf("?", StringComparison.Ordinal);
+            var posf = s.IndexOf("#", StringComparison.Ordinal);
+            var query = posq < 0 ? null : (posf < 0 ? s.Substring(posq) : s.Substring(posq, posf - posq));
+
+            return query;
+        }
+
+        /// <summary>
+        /// Removes the port from the uri.
+        /// </summary>
+        /// <param name="uri">The uri.</param>
+        /// <returns>The same uri, without its port.</returns>
+        public static Uri WithoutPort(this Uri uri)
+        {
+            return new Uri(uri.GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped));
+        }
+    }
+}
@@ -4,7 +4,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -16,19 +16,19 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
@@ -36,7 +36,7 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup><system.data>
    <DbProviderFactories>
      <remove invariant="MySql.Data.MySqlClient" />
      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
@@ -2,21 +2,21 @@
 <packages>
  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
  <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.8.8" targetFramework="net452" />
+  <package id="ImageProcessor" version="2.7.0.100" targetFramework="net452" />
  <package id="log4net" version="2.0.8" targetFramework="net45" />
  <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
-  <package id="Microsoft.Owin" version="3.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Security.Cookies" version="4.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net452" />
  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
  <package id="MySql.Data" version="6.9.9" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
  <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="semver" version="1.1.2" targetFramework="net45" />
+  <package id="semver" version="1.1.2" targetFramework="net452" />
  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
 </packages>
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\build\Microsoft.Diagnostics.Tracing.TraceEvent.props" Condition="Exists('..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\build\Microsoft.Diagnostics.Tracing.TraceEvent.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Umbraco.Tests.Benchmarks</RootNamespace>
    <AssemblyName>Umbraco.Tests.Benchmarks</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
@@ -39,8 +40,8 @@
    <RunPostBuildEvent>Always</RunPostBuildEvent>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="BenchmarkDotNet, Version=0.10.12.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
-      <HintPath>..\packages\BenchmarkDotNet.0.10.12\lib\net46\BenchmarkDotNet.dll</HintPath>
+    <Reference Include="BenchmarkDotNet, Version=0.10.3.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
+      <HintPath>..\packages\BenchmarkDotNet.0.10.3\lib\net45\BenchmarkDotNet.dll</HintPath>
    </Reference>
    <Reference Include="BenchmarkDotNet.Core, Version=0.10.12.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
      <HintPath>..\packages\BenchmarkDotNet.Core.0.10.12\lib\net46\BenchmarkDotNet.Core.dll</HintPath>
@@ -48,20 +49,27 @@
    <Reference Include="BenchmarkDotNet.Diagnostics.Windows, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
      <HintPath>..\packages\BenchmarkDotNet.Diagnostics.Windows.0.9.9\lib\net45\BenchmarkDotNet.Diagnostics.Windows.dll</HintPath>
    </Reference>
-    <Reference Include="BenchmarkDotNet.Toolchains.Roslyn, Version=0.10.12.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
-      <HintPath>..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.10.12\lib\net46\BenchmarkDotNet.Toolchains.Roslyn.dll</HintPath>
+    <Reference Include="BenchmarkDotNet.Toolchains.Roslyn, Version=0.10.3.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
+      <HintPath>..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.10.3\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll</HintPath>
    </Reference>
    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Dia2Lib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\lib\net45\Dia2Lib.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=2.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=1.0.41.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Diagnostics.FastSerialization, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\lib\net45\Microsoft.Diagnostics.FastSerialization.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.26.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\lib\net45\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
@@ -69,24 +77,28 @@
    <Reference Include="Microsoft.DotNet.PlatformAbstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.DotNet.PlatformAbstractions.1.1.1\lib\net451\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Win32.Registry, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Win32.Registry.4.3.0\lib\net46\Microsoft.Win32.Registry.dll</HintPath>
+    <Reference Include="Microsoft.Win32.Registry, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
    </Reference>
    <Reference Include="Moq, Version=4.1.1309.919, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
      <HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
    </Reference>
+    <Reference Include="OSExtensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\lib\net45\OSExtensions.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
    </Reference>
    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
+    <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System.Core" />
    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
@@ -113,11 +125,33 @@
    </Reference>
    <Reference Include="System.Management" />
    <Reference Include="System.Numerics" />
-    <Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
    </Reference>
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
+    <Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -126,21 +160,25 @@
    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Text.Encoding.CodePages, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
+    <Reference Include="System.Security.Principal.Windows, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@@ -149,7 +187,9 @@
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
@@ -160,6 +200,10 @@
    <Reference Include="System.Xml.XPath.XDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
    </Reference>
+    <Reference Include="TraceReloggerLib, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\lib\net45\TraceReloggerLib.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="ConcurrentDictionaryBenchmarks.cs" />
@@ -195,6 +239,10 @@
      <Name>Umbraco.Web</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
    <PostBuildEvent>
@@ -207,12 +255,11 @@
    <PreBuildEvent>xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
 xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D</PreBuildEvent>
  </PropertyGroup>
-  <Import Project="..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\build\Microsoft.Diagnostics.Tracing.TraceEvent.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.2.0.26\build\Microsoft.Diagnostics.Tracing.TraceEvent.props'))" />
  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
@@ -4,11 +4,11 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
@@ -16,27 +16,27 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -64,8 +64,60 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Diagnostics.Tracing.TraceEvent" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.26.0" newVersion="2.0.26.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Win32.Registry" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BenchmarkDotNet" version="0.10.12" targetFramework="net46" />
+  <package id="BenchmarkDotNet" version="0.10.3" targetFramework="net462" />
  <package id="BenchmarkDotNet.Core" version="0.10.12" targetFramework="net46" />
  <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.9" targetFramework="net45" />
-  <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.12" targetFramework="net46" />
+  <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.3" targetFramework="net462" />
  <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.Common" version="2.4.0" targetFramework="net46" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="2.4.0" targetFramework="net46" />
-  <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="1.0.41" targetFramework="net45" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.2" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.9.0" targetFramework="net462" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.9.0" targetFramework="net462" />
+  <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="2.0.26" targetFramework="net462" />
  <package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />
  <package id="Microsoft.DotNet.PlatformAbstractions" version="1.1.1" targetFramework="net46" />
  <package id="Microsoft.SqlServer.Compact" version="4.0.8854.1" targetFramework="net45" />
-  <package id="Microsoft.Win32.Registry" version="4.3.0" targetFramework="net46" />
+  <package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net462" />
  <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
  <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
  <package id="System.Collections" version="4.3.0" targetFramework="net46" />
  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
-  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net46" />
-  <package id="System.Console" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net462" />
+  <package id="System.Console" version="4.3.1" targetFramework="net462" />
  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net46" />
  <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net46" />
  <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net46" />
@@ -31,28 +31,32 @@
  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
  <package id="System.Linq" version="4.3.0" targetFramework="net46" />
  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net46" />
-  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net46" />
-  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net45" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net462" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net462" />
  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net46" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net46" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime" version="4.3.1" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net462" />
+  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net462" />
+  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net46" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net46" />
-  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net46" />
-  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.AccessControl" version="4.5.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
+  <package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net462" />
  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net46" />
-  <package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding.CodePages" version="4.5.0" targetFramework="net462" />
  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net46" />
  <package id="System.Threading" version="4.3.0" targetFramework="net46" />
  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net46" />
-  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net462" />
  <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net46" />
  <package id="System.Threading.Thread" version="4.3.0" targetFramework="net46" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net46" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net46" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net462" />
  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net46" />
  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net46" />
  <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net46" />
@@ -102,14 +102,14 @@
    </system.web>

  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
  </startup>
    <runtime>

        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
            <dependentAssembly>
                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -123,7 +123,7 @@

                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

-                <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />

            </dependentAssembly>

@@ -141,19 +141,19 @@
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -83,7 +83,7 @@ namespace Umbraco.Tests.CodeFirst
                    new PublishedPropertyType("articleDate", 0, "?"), 
                    new PublishedPropertyType("pageTitle", 0, "?"), 
                };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
            PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
            Debug.Print("INIT STRONG {0}",
                PublishedContentType.Get(PublishedItemType.Content, "anything")
@@ -148,4 +148,4 @@ namespace Umbraco.Tests.CodeFirst
        }
        #endregion
    }
-}
+}
@@ -43,7 +43,7 @@ namespace Umbraco.Tests
                    // AutoPublishedContentType will auto-generate other properties
                    new PublishedPropertyType("content", 0, "?"), 
                };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
            PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
            Debug.Print("INIT LIB {0}",
                PublishedContentType.Get(PublishedItemType.Content, "anything")
@@ -41,7 +41,7 @@ namespace Umbraco.Tests.Membership
                    new PublishedPropertyType("bodyText", 0, "?"), 
                    new PublishedPropertyType("author", 0, "?")
                };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
            PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;

        }
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Migrations.SqlScripts {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class SqlResources {
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.PublishedContent
                    new PublishedPropertyType("creatorName", 0, "?"), 
                    new PublishedPropertyType("blah", 0, "?"), // ugly error when that one is missing...
                };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
            PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;

        }
@@ -729,4 +729,4 @@ namespace Umbraco.Tests.PublishedContent
 			return s.Contains(val.ToString());
 		}
 	}
-}
+}
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.PublishedContent

            // need to specify a custom callback for unit tests
            // AutoPublishedContentTypes generates properties automatically
-            var type = new AutoPublishedContentType(0, "anything", new PublishedPropertyType[] {});
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", new PublishedPropertyType[] {});
            PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;

            // need to specify a different callback for testing
@@ -251,4 +251,4 @@ namespace Umbraco.Tests.PublishedContent
            }
 	    }
 	}
-}
+}
@@ -234,9 +234,9 @@ namespace Umbraco.Tests.PublishedContent
                        new PublishedPropertyType("prop1", 1, "?"), 
                    };

-            var contentType1 = new PublishedContentType(1, "ContentType1", Enumerable.Empty<string>(), props);
-            var contentType2 = new PublishedContentType(2, "ContentType2", Enumerable.Empty<string>(), props);
-            var contentType2s = new PublishedContentType(3, "ContentType2Sub", Enumerable.Empty<string>(), props);
+            var contentType1 = new PublishedContentType(1, "ContentType1", "ContentType1", "ContentType1", Enumerable.Empty<string>(), props);
+            var contentType2 = new PublishedContentType(2, "ContentType2", "ContentType2", "ContentType2", Enumerable.Empty<string>(), props);
+            var contentType2s = new PublishedContentType(3, "ContentType2Sub", "ContentType2Sub", "ContentType2Sub", Enumerable.Empty<string>(), props);

            cache.Add(new SolidPublishedContent(contentType1)
                {
@@ -29,7 +29,7 @@ namespace Umbraco.Tests.PublishedContent
                    // AutoPublishedContentType will auto-generate other properties
                    new PublishedPropertyType("content", 0, Constants.PropertyEditors.TinyMCEAlias), 
                };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
            PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;

            var rCtx = GetRoutingContext("/test", 1234);
@@ -65,4 +65,4 @@ namespace Umbraco.Tests.PublishedContent
            UmbracoContext.Current = null;
        }
    }
-}
+}
@@ -354,12 +354,12 @@ namespace Umbraco.Tests.PublishedContent
    {
        private static readonly PublishedPropertyType Default = new PublishedPropertyType("*", 0, "?");

-        public AutoPublishedContentType(int id, string alias, IEnumerable<PublishedPropertyType> propertyTypes)
-            : base(id, alias, Enumerable.Empty<string>(), propertyTypes)
+        public AutoPublishedContentType(int id, string alias, string name, string description, IEnumerable<PublishedPropertyType> propertyTypes)
+            : base(id, alias, name, description, Enumerable.Empty<string>(), propertyTypes)
        { }

-        public AutoPublishedContentType(int id, string alias, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
-            : base(id, alias, compositionAliases, propertyTypes)
+        public AutoPublishedContentType(int id, string alias, string name, string description, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
+            : base(id, alias, name, description, compositionAliases, propertyTypes)
        { }

        public override PublishedPropertyType GetPropertyType(string alias)
@@ -49,7 +49,7 @@ namespace Umbraco.Tests.PublishedContent
                    new PublishedPropertyType("testRecursive", 0, "?"),
                };
            var compositionAliases = new[] { "MyCompositionAlias" };
-            var type = new AutoPublishedContentType(0, "anything", compositionAliases, propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", compositionAliases, propertyTypes);
            PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
        }

@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Services.Importing {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class ImportResources {
@@ -322,7 +322,7 @@ namespace Umbraco.Tests.Services.Importing {
        ///    &lt;/package&gt;
        ///    &lt;author&gt;
        ///      &lt;name&gt;Morten Christensen&lt;/name&gt;
-        ///  [rest of string was truncated]&quot;;.
+        /// [rest of string was truncated]&quot;;.
        /// </summary>
        internal static string TemplateOnly_Package {
            get {
@@ -348,7 +348,7 @@ namespace Umbraco.Tests.Services.Importing {
        ///    &lt;/package&gt;
        ///    &lt;author&gt;
        ///      &lt;name&gt;Morten Christensen&lt;/name&gt;
-        ///  [rest of string was truncated]&quot;;.
+        /// [rest of string was truncated]&quot;;.
        /// </summary>
        internal static string TemplateOnly_Updated_Package {
            get {
@@ -0,0 +1,39 @@
+using System;
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
+
+namespace Umbraco.Tests.Services
+{
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
+    [TestFixture, RequiresSTA]
+    public class MemberGroupServiceTests : BaseServiceTest
+    {
+        [SetUp]
+        public override void Initialize()
+        {
+            base.Initialize();
+        }
+
+        [TearDown]
+        public override void TearDown()
+        {
+            base.TearDown();
+        }
+        
+        [Test]
+        [ExpectedException("System.InvalidOperationException")]
+        public void New_MemberGroup_Is_Not_Allowed_With_Empty_Name()
+        {
+            var service = ServiceContext.MemberGroupService;
+            
+            service.Save(new MemberGroup {Name = ""});
+
+            Assert.Fail("An exception should have been thrown");
+        }
+    }
+}
@@ -61,6 +61,17 @@ namespace Umbraco.Tests.Strings
            Assert.AreEqual(stripped, result);
        }

+        [TestCase("'+alert(1234)+'", "+alert1234+")]
+        [TestCase("'+alert(56+78)+'", "+alert56+78+")]
+        [TestCase("{{file}}", "file")]
+        [TestCase("'+alert('hello')+'", "+alerthello+")]
+        [TestCase("Test", "Test")]
+        public void Clean_From_XSS(string input, string result)
+        {
+            var cleaned = input.CleanForXss();
+            Assert.AreEqual(cleaned, result);
+        }
+
        [TestCase("This is a string to encrypt")]
        [TestCase("This is a string to encrypt\nThis is a second line")]
        [TestCase("    White space is preserved    ")]
@@ -15,7 +15,7 @@ namespace Umbraco.Tests.TestHelpers

            // need to specify a custom callback for unit tests
            // AutoPublishedContentTypes generates properties automatically
-            var type = new AutoPublishedContentType(0, "anything", new PublishedPropertyType[] {});
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", new PublishedPropertyType[] {});
            PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
        }
        
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.TreesAndSections {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class ResourceFiles {
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Umbraco.Tests</RootNamespace>
    <AssemblyName>Umbraco.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
@@ -65,6 +65,12 @@
    <Reference Include="Examine, Version=0.1.89.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Examine.0.1.89\lib\net45\Examine.dll</HintPath>
    </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.8.8.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.8\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="Examine, Version=0.1.90.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.90\lib\net45\Examine.dll</HintPath>
+    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
    </Reference>
@@ -78,25 +84,25 @@
      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.4.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Hosting, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Hosting.4.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Security, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Testing, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Testing.3.1.0\lib\net45\Microsoft.Owin.Testing.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Testing, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Testing.4.0.1\lib\net45\Microsoft.Owin.Testing.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
@@ -107,8 +113,8 @@
    <Reference Include="Moq, Version=4.1.1309.919, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
      <HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
@@ -117,7 +123,7 @@
      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
    </Reference>
    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
+      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.Composition" />
@@ -133,8 +139,8 @@
    </Reference>
    <Reference Include="System.Drawing" />
    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
    <Reference Include="System.Net.Http.WebRequest" />
    <Reference Include="System.Runtime.Caching" />
@@ -142,38 +148,38 @@
    <Reference Include="System.Web" />
    <Reference Include="System.Web.ApplicationServices" />
    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
    </Reference>
-    <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
    </Reference>
-    <Reference Include="System.Web.Http.Owin, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
+    <Reference Include="System.Web.Http.Owin, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.7\lib\net45\System.Web.Http.Owin.dll</HintPath>
    </Reference>
-    <Reference Include="System.Web.Http.SelfHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.SelfHost.5.2.3\lib\net45\System.Web.Http.SelfHost.dll</HintPath>
+    <Reference Include="System.Web.Http.SelfHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.SelfHost.5.2.7\lib\net45\System.Web.Http.SelfHost.dll</HintPath>
    </Reference>
-    <Reference Include="System.Web.Http.Tracing, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.3\lib\net45\System.Web.Http.Tracing.dll</HintPath>
+    <Reference Include="System.Web.Http.Tracing, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.7\lib\net45\System.Web.Http.Tracing.dll</HintPath>
    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.Services" />
    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@@ -193,6 +199,7 @@
    <Compile Include="PublishedContent\StronglyTypedModels\Home.cs" />
    <Compile Include="Services\AuditServiceTests.cs" />
    <Compile Include="Services\ConsentServiceTests.cs" />
+    <Compile Include="Services\MemberGroupServiceTests.cs" />
    <Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingExtensions.cs" />
    <Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingMiddleware.cs" />
    <Compile Include="TestHelpers\ControllerTesting\SpecificAssemblyResolver.cs" />
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.UmbracoExamine {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class TestFiles {
@@ -29,5 +29,30 @@ namespace Umbraco.Tests.Web.Mvc
 			var output = _htmlHelper.Wrap("div", "hello world", new {style = "color:red;", onclick = "void();"});
 			Assert.AreEqual("<div style=\"color:red;\" onclick=\"void();\">hello world</div>", output.ToHtmlString());
 		}
-	}
-}
+
+        [Test]
+        public void GetRelatedLinkHtml_Simple()
+        {
+            var relatedLink = new Umbraco.Web.Models.RelatedLink {
+                Caption = "Link Caption",
+                NewWindow = true,
+                Link = "https://www.google.com/"
+            };
+            var output = _htmlHelper.GetRelatedLinkHtml(relatedLink);
+            Assert.AreEqual("<a href=\"https://www.google.com/\" target=\"_blank\">Link Caption</a>", output.ToHtmlString());
+        }
+
+        [Test]
+        public void GetRelatedLinkHtml_HtmlAttributes()
+        {
+            var relatedLink = new Umbraco.Web.Models.RelatedLink
+            {
+                Caption = "Link Caption",
+                NewWindow = true,
+                Link = "https://www.google.com/"
+            };
+            var output = _htmlHelper.GetRelatedLinkHtml(relatedLink, new { @class = "test-class"});
+            Assert.AreEqual("<a class=\"test-class\" href=\"https://www.google.com/\" target=\"_blank\">Link Caption</a>", output.ToHtmlString());
+        }
+    }
+}
@@ -2,41 +2,42 @@
 <packages>
  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
  <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.89" targetFramework="net45" />
+  <package id="Examine" version="0.1.90" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.8.8" targetFramework="net452" />
  <package id="log4net" version="2.0.8" targetFramework="net45" />
  <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Tracing" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
-  <package id="Microsoft.Owin" version="3.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Hosting" version="3.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Testing" version="3.1.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Tracing" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Hosting" version="4.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Testing" version="4.0.1" targetFramework="net452" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
  <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
  <package id="NUnit" version="2.6.2" targetFramework="net45" />
  <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net45" />
  <package id="Owin" version="1.0" targetFramework="net45" />
  <package id="Selenium.WebDriver" version="2.32.0" targetFramework="net45" />
-  <package id="semver" version="1.1.2" targetFramework="net45" />
+  <package id="semver" version="1.1.2" targetFramework="net452" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net45" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
-  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime" version="4.3.1" targetFramework="net452" />
+  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net452" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net452" />
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net452" />
 </packages>
@@ -25,7 +25,7 @@
    "jquery-migrate": "1.4.0",
    "angular-dynamic-locale": "0.1.28",
    "ng-file-upload": "~7.3.8",
-    "tinymce": "~4.7.1",
+    "tinymce": "~4.9.4",
    "codemirror": "~5.3.0",
    "angular-local-storage": "~0.2.3",
    "moment": "~2.10.3",
@@ -4146,8 +4146,7 @@
        "ansi-regex": {
          "version": "2.1.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "aproba": {
          "version": "1.2.0",
@@ -4168,14 +4167,12 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -4190,20 +4187,17 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -4320,8 +4314,7 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "ini": {
          "version": "1.3.5",
@@ -4333,7 +4326,6 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -4348,7 +4340,6 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -4356,14 +4347,12 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "minipass": {
          "version": "2.2.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.1",
            "yallist": "^3.0.0"
@@ -4382,7 +4371,6 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -4463,8 +4451,7 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -4476,7 +4463,6 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -4562,8 +4548,7 @@
        "safe-buffer": {
          "version": "5.1.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@@ -4599,7 +4584,6 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -4619,7 +4603,6 @@
          "version": "3.0.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@@ -4663,14 +4646,12 @@
        "wrappy": {
          "version": "1.0.2",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "yallist": {
          "version": "3.0.2",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        }
      }
    },
@@ -11,8 +11,7 @@ LazyLoad.js([
      '../js/umbraco.security.js',
      '../ServerVariables',
      '../lib/spectrum/spectrum.js',
-      '../js/umbraco.canvasdesigner.js',
-	  '../js/canvasdesigner.panel.js'
+      '../js/umbraco.canvasdesigner.js'
 ], function () {
    jQuery(document).ready(function () {
        angular.bootstrap(document, ['Umbraco.canvasdesigner']);
@@ -18,6 +18,7 @@

        <umb-toggle
            checked="vm.checked"
+            disabled="vm.disabled"
            on-click="vm.toggle()"
            show-labels="true"
            label-on="Start"
@@ -38,6 +39,7 @@

            var vm = this;
            vm.checked = false;
+            vm.disabled = false;

            vm.toggle = toggle;

@@ -52,6 +54,7 @@
 </pre>

@param {boolean} checked Set to <code>true</code> or <code>false</code> to toggle the switch.
+@param {boolean} disabled Set to <code>true</code> or <code>false</code> to disable/enable the switch.
@param {callback} onClick The function which should be called when the toggle is clicked.
@param {string=} showLabels Set to <code>true</code> or <code>false</code> to show a "On" or "Off" label next to the switch.
@param {string=} labelOn Set a custom label for when the switched is turned on. It will default to "On".
@@ -115,6 +118,7 @@
            templateUrl: 'views/components/buttons/umb-toggle.html',
            scope: {
                checked: "=",
+                disabled: "=",
                onClick: "&",
                labelOn: "@?",
                labelOff: "@?",
@@ -53,6 +53,16 @@
                if (scope.documentType !== null) {
                    scope.previewOpenUrl = '#/settings/documenttypes/edit/' + scope.documentType.id;
                }
+
+                // only allow configuring scheduled publishing if the user has publish ("U") and unpublish ("Z") permissions on this node
+                scope.allowScheduledPublishing = _.contains(scope.node.allowedActions, "U") && _.contains(scope.node.allowedActions, "Z");
+
+                ensureUniqueUrls();
+            }
+
+            // make sure we don't show duplicate URLs in case multiple URL providers assign the same URLs to the content (see issue 3842 for details)
+            function ensureUniqueUrls() {
+                scope.node.urls = _.uniq(scope.node.urls);
            }

            scope.auditTrailPageChange = function (pageNumber) {
@@ -293,11 +303,12 @@
                if (!newValue) { return; }
                if (newValue === oldValue) { return; }

-                if(isInfoTab) {
+                if (isInfoTab) {
                    loadAuditTrail();
                    loadRedirectUrls();
                    formatDatesToLocal();
                    setNodePublishStatus(scope.node);
+                    ensureUniqueUrls();
                }
            });

@@ -0,0 +1,55 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbCheckbox
+@restrict E
+@scope
+
+@description
+<b>Added in Umbraco version 7.14.0</b> Use this directive to render an umbraco checkbox.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-checkbox
+            name="checkboxlist"
+            value="{{key}}"
+            model="true"
+            text="{{text}}">
+        </umb-checkbox>
+
+    </div>
+</pre>
+
+@param {boolean} model Set to <code>true</code> or <code>false</code> to set the checkbox to checked or unchecked.
+@param {string} value Set the value of the checkbox.
+@param {string} name Set the name of the checkbox.
+@param {string} text Set the text for the checkbox label.
+
+
+**/
+
+(function () {
+    'use strict';
+
+    function CheckboxDirective() {
+        var directive = {
+            restrict: 'E',
+            replace: true,
+            templateUrl: 'views/components/forms/umb-checkbox.html',
+            scope: {
+                model: "=",
+                value: "@",
+                name: "@",
+                text: "@",
+                required: "="
+            }
+        };
+
+        return directive;
+
+    }
+
+    angular.module('umbraco.directives').directive('umbCheckbox', CheckboxDirective);
+
+})();
@@ -0,0 +1,54 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbRadiobutton
+@restrict E
+@scope
+
+@description
+<b>Added in Umbraco version 7.14.0</b> Use this directive to render an umbraco radio button.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-radiobutton
+            name="checkboxlist"
+            value="{{key}}"
+            model="true"
+            text="{{text}}">
+        </umb-radiobutton>
+
+    </div>
+</pre>
+
+@param {boolean} model Set to <code>true</code> or <code>false</code> to set the radiobutton to checked or unchecked.
+@param {string} value Set the value of the radiobutton.
+@param {string} name Set the name of the radiobutton.
+@param {string} text Set the text for the radiobutton label.
+
+
+**/
+
+(function () {
+    'use strict';
+
+    function RadiobuttonDirective() {
+        var directive = {
+            restrict: 'E',
+            replace: true,
+            templateUrl: 'views/components/forms/umb-radiobutton.html',
+            scope: {
+                model: "=",
+                value: "@",
+                name: "@",
+                text: "@"
+            }
+        };
+
+        return directive;
+
+    }
+
+    angular.module('umbraco.directives').directive('umbRadiobutton', RadiobuttonDirective);
+
+})();
@@ -103,34 +103,6 @@ angular.module("umbraco.directives")
 						scope.dimensions.cropper.height = _viewPortH; //  scope.dimensions.viewport.height - 2 * scope.dimensions.margin;
 					};

-
-					//when loading an image without any crop info, we center and fit it
-					var resizeImageToEditor = function(){
-						//returns size fitting the cropper
-						var size = cropperHelper.calculateAspectRatioFit(
-								scope.dimensions.image.width,
-								scope.dimensions.image.height,
-								scope.dimensions.cropper.width,
-								scope.dimensions.cropper.height,
-								true);
-
-						//sets the image size and updates the scope
-						scope.dimensions.image.width = size.width;
-						scope.dimensions.image.height = size.height;
-
-						//calculate the best suited ratios
-						scope.dimensions.scale.min = size.ratio;
-						scope.dimensions.scale.max = 2;
-						scope.dimensions.scale.current = size.ratio;
-
-						//center the image
-						var position = cropperHelper.centerInsideViewPort(scope.dimensions.image, scope.dimensions.cropper);
-						scope.dimensions.top = position.top;
-						scope.dimensions.left = position.left;
-
-						setConstraints();
-					};
-
 					//resize to a given ratio
 					var resizeImageToScale = function(ratio){
 						//do stuff
@@ -227,12 +199,19 @@ angular.module("umbraco.directives")
 						//set dimensions on image, viewport, cropper etc
 						setDimensions(image);

-						//if we have a crop already position the image
-						if(scope.crop){
-							resizeImageToCrop();
-						}else{
-							resizeImageToEditor();
-						}
+						//create a default crop if we haven't got one already
+                        var createDefaultCrop = !scope.crop;
+                        if (createDefaultCrop) {
+                            calculateCropBox();
+                        }
+
+						resizeImageToCrop();
+
+                        //if we're creating a new crop, make sure to zoom out fully
+                        if (createDefaultCrop) {
+                            scope.dimensions.scale.current = scope.dimensions.scale.min;
+    						resizeImageToScale(scope.dimensions.scale.min);
+                        }

 						//sets constaints for the cropper
 						setConstraints();
@@ -253,7 +232,7 @@ angular.module("umbraco.directives")
 					var throttledResizing = _.throttle(function(){
 						resizeImageToScale(scope.dimensions.scale.current);
 						calculateCropBox();
-					}, 100);
+					}, 16);


 					//happens when we change the scale
@@ -14,7 +14,8 @@ angular.module("umbraco.directives")
 				scope: {
 					src: '=',
 					center: "=",
-                    onImageLoaded: "&"
+                    onImageLoaded: "&",
+                    onGravityChanged: "&"
 				},
 				link: function(scope, element, attrs) {

@@ -34,7 +35,7 @@ angular.module("umbraco.directives")
                    var $overlay = element.find(".overlay");

 				    scope.style = function () {
-                        if (scope.dimensions.width <= 0) {
+                        if (scope.dimensions.width <= 0 || scope.dimensions.height <= 0) {
 							setDimensions();
 						}

@@ -52,7 +53,7 @@ angular.module("umbraco.directives")

 					    calculateGravity(offsetX, offsetY);

-					    lazyEndEvent();
+					    gravityChanged();
 					};

                    var setDimensions = function () {
@@ -77,12 +78,11 @@ angular.module("umbraco.directives")
 						scope.center.top =  (scope.dimensions.top+10) / scope.dimensions.height;
 					};

-					var lazyEndEvent = _.debounce(function(){
-						scope.$apply(function(){
-							scope.$emit("imageFocalPointStop");
-						});
-					}, 2000);
-
+                    var gravityChanged = function () {
+                        if (angular.isFunction(scope.onGravityChanged)) {
+                            scope.onGravityChanged();
+                        }
+                    };

 					//Drag and drop positioning, using jquery ui draggable
 					//TODO ensure that the point doesnt go outside the box
@@ -100,7 +100,7 @@ angular.module("umbraco.directives")
 								calculateGravity(offsetX, offsetY);
 							});

-							lazyEndEvent();
+							gravityChanged();
 						}
 					});

@@ -12,6 +12,7 @@ function treeSearchBox(localizationService, searchService, $q) {
            searchFromName: "@",
            showSearch: "@",
            section: "@",
+            ignoreUserStartNodes: "@",
            hideSearchCallback: "=",
            searchCallback: "="
        },
@@ -34,6 +35,7 @@ function treeSearchBox(localizationService, searchService, $q) {
                scope.showSearch = "false";
            }

+
            //used to cancel any request in progress if another one needs to take it's place
            var canceler = null;

@@ -60,6 +62,11 @@ function treeSearchBox(localizationService, searchService, $q) {
                        searchArgs["searchFrom"] = scope.searchFromId;
                    }

+                    //append ignoreUserStartNodes value if there is one
+                    if (scope.ignoreUserStartNodes) {                        
+                        searchArgs["ignoreUserStartNodes"] = scope.ignoreUserStartNodes;
+                    }                   
+
                    searcher(searchArgs).then(function (data) {
                        scope.searchCallback(data);
                        //set back to null so it can be re-created
@@ -86,20 +86,21 @@ angular.module("umbraco.directives")
                function generateAlias(value) {

                  if (generateAliasTimeout) {
-                    $timeout.cancel(generateAliasTimeout);
+                     $timeout.cancel(generateAliasTimeout);
                  }

-                  if( value !== undefined && value !== "" && value !== null) {
+                  if (value !== undefined && value !== "" && value !== null) {

-                      scope.alias = "";
+                    scope.alias = "";
                    scope.placeholderText = scope.labels.busy;

                    generateAliasTimeout = $timeout(function () {
                       updateAlias = true;
                        entityResource.getSafeAlias(encodeURIComponent(value), true).then(function (safeAlias) {
                            if (updateAlias) {
-                              scope.alias = safeAlias.alias;
-                           }
+                                scope.alias = safeAlias.alias;
+                            }
+                            scope.placeholderText = scope.labels.idle;
                      });
                    }, 500);

@@ -108,7 +109,6 @@ angular.module("umbraco.directives")
                    scope.alias = "";
                    scope.placeholderText = scope.labels.idle;
                  }
-
                }

                // if alias gets unlocked - stop watching alias
@@ -119,17 +119,17 @@ angular.module("umbraco.directives")
                }));

                // validate custom entered alias
-                eventBindings.push(scope.$watch('alias', function(newValue, oldValue){
-
-                  if(scope.alias === "" && bindWatcher === true || scope.alias === null && bindWatcher === true) {
-                    // add watcher
-                    eventBindings.push(scope.$watch('aliasFrom', function(newValue, oldValue) {
-                       if(bindWatcher) {
-                          generateAlias(newValue);
-                       }
-                    }));
-                  }
-
+                eventBindings.push(scope.$watch('alias', function (newValue, oldValue) {
+                    if (scope.alias === "" || scope.alias === null || scope.alias === undefined) {
+                        if (bindWatcher === true) {
+                            // add watcher
+                            eventBindings.push(scope.$watch('aliasFrom', function (newValue, oldValue) {
+                                if (bindWatcher) {
+                                    generateAlias(newValue);
+                                }
+                            }));
+                        }
+                    }
               }));

               // clean up
@@ -38,7 +38,7 @@ Use this directive to generate color swatches to pick from.
                scope.selectedColor = color;

                if (scope.onSelect) {
-                    scope.onSelect(color);
+                    scope.onSelect({color: color });
                }
            };
        }
@@ -3,7 +3,7 @@
    * @name umbraco.resources.codefileResource
    * @description Loads in data for files that contain code such as js scripts, partial views and partial view macros
    **/
-function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
+function codefileResource($q, $http, umbDataFormatter, umbRequestHelper, localizationService) {

    return {

@@ -106,13 +106,16 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
         *
         */
        deleteByPath: function (type, virtualpath) {
+
+            var promise = localizationService.localize("codefile_deleteItemFailed", [virtualpath]);
+
            return umbRequestHelper.resourcePromise(
                $http.post(
                    umbRequestHelper.getApiUrl(
                        "codeFileApiBaseUrl",
                        "Delete",
                        [{ type: type }, { virtualPath: virtualpath}])),
-                "Failed to delete item: " + virtualpath);
+                promise);
        },

        /**
@@ -236,13 +239,19 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
         *
         */

-        createContainer: function(type, parentId, name) {
+        createContainer: function (type, parentId, name) {
+
+            // Is the parent ID numeric?
+            var key = "codefile_createFolderFailedBy" + (isNaN(parseInt(parentId)) ? "Name" : "Id");
+
+            var promise = localizationService.localize(key, [parentId]);
+
            return umbRequestHelper.resourcePromise(
                $http.post(umbRequestHelper.getApiUrl(
                    "codeFileApiBaseUrl", 
                    "PostCreateContainer", 
                    { type: type, parentId: parentId, name: encodeURIComponent(name) })),
-                'Failed to create a folder under parent id ' + parentId);
+                promise);
        }

    };
@@ -292,14 +292,29 @@ function entityResource($q, $http, umbRequestHelper) {
         * @returns {Promise} resourcePromise object containing the entity.
         *
         */
-        getAncestors: function (id, type) {            
+        getAncestors: function (id, type, options) {    
+            var defaults = {
+                ignoreUserStartNodes: false
+            };
+            if (options === undefined) {
+                options = {};
+            }
+            //overwrite the defaults if there are any specified
+            angular.extend(defaults, options);
+            //now copy back to the options we will use
+            options = defaults;
+
            return umbRequestHelper.resourcePromise(
               $http.get(
                   umbRequestHelper.getApiUrl(
                       "entityApiBaseUrl",
                       "GetAncestors",
-                       [{id: id}, {type: type}])),
-               'Failed to retrieve ancestor data for id ' + id);
+                       [
+                           { id: id },
+                           { type: type },
+                           { ignoreUserStartNodes: options.ignoreUserStartNodes }
+                       ])),
+                       'Failed to retrieve ancestor data for id ' + id);
        },
        
        /**
@@ -431,7 +446,8 @@ function entityResource($q, $http, umbRequestHelper) {
                pageNumber: 1,
                filter: '',
                orderDirection: "Ascending",
-                orderBy: "SortOrder"
+                orderBy: "SortOrder",
+                ignoreUserStartNodes: false
            };
            if (options === undefined) {
                options = {};
@@ -460,7 +476,8 @@ function entityResource($q, $http, umbRequestHelper) {
                            pageSize: options.pageSize,
                            orderBy: options.orderBy,
                            orderDirection: options.orderDirection,
-                            filter: encodeURIComponent(options.filter)
+                            filter: encodeURIComponent(options.filter),
+                            ignoreUserStartNodes: options.ignoreUserStartNodes
                        }
                    )),
                'Failed to retrieve child data for id ' + parentId);
@@ -488,12 +505,19 @@ function entityResource($q, $http, umbRequestHelper) {
         * @returns {Promise} resourcePromise object containing the entity array.
         *
         */
-        search: function (query, type, searchFrom, canceler) {
+        search: function (query, type, options, canceler) {

-            var args = [{ query: query }, { type: type }];
-            if (searchFrom) {
-                args.push({ searchFrom: searchFrom });
+            var defaults = {
+                searchFrom: null,
+                ignoreUserStartNodes: false
+            };
+            if (options === undefined) {
+                options = {};
            }
+            //overwrite the defaults if there are any specified
+            angular.extend(defaults, options);
+            //now copy back to the options we will use
+            options = defaults;

            var httpConfig = {};
            if (canceler) {
@@ -505,7 +529,12 @@ function entityResource($q, $http, umbRequestHelper) {
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
                        "Search",
-                        args),
+                        {
+                            query: query,
+                            type: type,
+                            searchFrom: options.searchFrom,
+                            ignoreUserStartNodes: options.ignoreUserStartNodes
+                        }),
                    httpConfig),
                'Failed to retrieve entity data for query ' + query);
        },
@@ -329,7 +329,8 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
                filter: '',
                orderDirection: "Ascending",
                orderBy: "SortOrder",
-                orderBySystemField: true
+                orderBySystemField: true,
+                ignoreUserStartNodes: false
            };
            if (options === undefined) {
                options = {};
@@ -372,7 +373,8 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
                                    { orderBy: options.orderBy },
                                    { orderDirection: options.orderDirection },
                                    { orderBySystemField: toBool(options.orderBySystemField) },
-                                    { filter: options.filter }
+                                    { filter: options.filter },
+                                    { ignoreUserStartNodes: options.ignoreUserStartNodes }
                              ])),
                  'Failed to retrieve children for media item ' + parentId);
        },
@@ -26,7 +26,7 @@ function relationResource($q, $http, umbRequestHelper) {
                    umbRequestHelper.getApiUrl(
                        "relationApiBaseUrl",
                        "GetByChildId",
-                        [{ childId: id, relationTypeAlias: alias }])),
+                        { childId: id, relationTypeAlias: alias })),
                "Failed to get relation by child ID " + id + " and type of " + alias);
        },

@@ -62,4 +62,4 @@ function relationResource($q, $http, umbRequestHelper) {
    };
 }

-angular.module('umbraco.resources').factory('relationResource', relationResource);
+angular.module('umbraco.resources').factory('relationResource', relationResource);
@@ -3,7 +3,7 @@
    * @name umbraco.resources.templateResource
    * @description Loads in data for templates
    **/
-function templateResource($q, $http, umbDataFormatter, umbRequestHelper) {
+function templateResource($q, $http, umbDataFormatter, umbRequestHelper, localizationService) {

    return {

@@ -152,13 +152,16 @@ function templateResource($q, $http, umbDataFormatter, umbRequestHelper) {
         *
         */
        deleteById: function(id) {
+
+            var promise = localizationService.localize("template_deleteByIdFailed", [id]);
+
            return umbRequestHelper.resourcePromise(
                $http.post(
                    umbRequestHelper.getApiUrl(
                        "templateApiBaseUrl",
                        "DeleteById",
                        [{ id: id }])),
-                "Failed to delete item " + id);
+                promise);
        },

        /**
@@ -44,21 +44,28 @@ angular.module('umbraco.security.interceptor')
                        return promise;
                    }

-                    //A 401 means that the user is not logged in
-                    if (originalResponse.status === 401 && !originalResponse.config.url.endsWith("umbraco/backoffice/UmbracoApi/Authentication/GetCurrentUser")) {
+                    if (originalResponse.status === 401) {

-                      var userService = $injector.get('userService'); // see above
+                        //A 401 means that the user is not logged in

-                      //Associate the user name with the retry to ensure we retry for the right user
-                      promise = userService.getCurrentUser()
-                        .then(function (user) {
-                          var userName = user ? user.name : null;
-                          //The request bounced because it was not authorized - add a new request to the retry queue
-                          return queue.pushRetryFn('unauthorized-server', userName, function retryRequest() {
-                            // We must use $injector to get the $http service to prevent circular dependency
-                            return $injector.get('$http')(originalResponse.config);
-                          });
-                        });
+                        //avoid an infinite loop
+                        var umbRequestHelper = $injector.get('umbRequestHelper');
+                        var getCurrentUserPath = umbRequestHelper.getApiUrl("authenticationApiBaseUrl", "GetCurrentUser");
+                        if (!originalResponse.config.url.endsWith(getCurrentUserPath)) {
+
+                            var userService = $injector.get('userService'); // see above
+
+                            //Associate the user name with the retry to ensure we retry for the right user
+                            promise = userService.getCurrentUser()
+                                .then(function (user) {
+                                    var userName = user ? user.name : null;
+                                    //The request bounced because it was not authorized - add a new request to the retry queue
+                                    return queue.pushRetryFn('unauthorized-server', userName, function retryRequest() {
+                                        // We must use $injector to get the $http service to prevent circular dependency
+                                        return $injector.get('$http')(originalResponse.config);
+                                    });
+                                });
+                        }
                    }
                    else if (originalResponse.status === 404) {

@@ -123,13 +123,6 @@ function cropperHelper(umbRequestHelper, $http) {
 			return crop;
 		},

-		centerInsideViewPort : function(img, viewport){
-			var left = viewport.width/ 2 - img.width / 2,
-				top = viewport.height / 2 - img.height / 2;
-			
-			return {left: left, top: top};
-		},
-
 		alignToCoordinates : function(image, center, viewport){
 			
 			var min_left = (image.width) - (viewport.width);
@@ -42,7 +42,11 @@ angular.module('umbraco.services')
                    throw "args.term is required";
                }

-                return entityResource.search(args.term, "Member", args.searchFrom).then(function (data) {
+                var options = {
+                    searchFrom: args.searchFrom                    
+                }
+
+                return entityResource.search(args.term, "Member", options).then(function (data) {
                    _.each(data, function (item) {
                        searchResultFormatter.configureMemberResult(item);
                    });
@@ -67,7 +71,12 @@ angular.module('umbraco.services')
                    throw "args.term is required";
                }

-                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler).then(function (data) {
+                var options = {
+                    searchFrom: args.searchFrom,
+                    ignoreUserStartNodes: args.ignoreUserStartNodes
+                }
+
+                return entityResource.search(args.term, "Document", options, args.canceler).then(function (data) {
                    _.each(data, function (item) {
                        searchResultFormatter.configureContentResult(item);
                    });
@@ -92,7 +101,12 @@ angular.module('umbraco.services')
                    throw "args.term is required";
                }

-                return entityResource.search(args.term, "Media", args.searchFrom).then(function (data) {
+                var options = {
+                    searchFrom: args.searchFrom,
+                    ignoreUserStartNodes: args.ignoreUserStartNodes
+                }
+
+                return entityResource.search(args.term, "Media", options).then(function (data) {
                    _.each(data, function (item) {
                        searchResultFormatter.configureMediaResult(item);
                    });
@@ -157,4 +171,4 @@ angular.module('umbraco.services')
                var currentSection = sectionAlias;
            }
        };
-    });
+    });
@@ -850,9 +850,10 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro
 				return;
 			}

-			// Is email and not //user@domain.com
-			if (href.indexOf('@') > 0 && href.indexOf('//') === -1 && href.indexOf('mailto:') === -1) {
-				href = 'mailto:' + href;
+		    // Is email and not //user@domain.com and protocol (e.g. mailto:, sip:) is not specified
+		    if (href.indexOf('@') > 0 && href.indexOf('//') === -1 && href.indexOf(':') === -1) {
+		        // assume it's a mailto link
+		        href = 'mailto:' + href;
 				insertLink();
 				return;
 			}
@@ -16,17 +16,17 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
 	};

 	//add to umbraco installer facts here
-	var facts = ['Umbraco helped millions of people watch a man jump from the edge of space',
-					'Over 440 000 websites are currently powered by Umbraco',
+	var facts = ["Umbraco helped millions of people watch a man jump from the edge of space",
+					"Over 500 000 websites are currently powered by Umbraco",
 					"At least 2 people have named their cat 'Umbraco'",
-					'On an average day, more than 1000 people download Umbraco',
-					'<a target="_blank" href="https://umbraco.tv">umbraco.tv</a> is the premier source of Umbraco video tutorials to get you started',
-					'You can find the world\'s friendliest CMS community at <a target="_blank" href="https://our.umbraco.com">our.umbraco.com</a>',
-					'You can become a certified Umbraco developer by attending one of the official courses',
-					'Umbraco works really well on tablets',
-					'You have 100% control over your markup and design when crafting a website in Umbraco',
-					'Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company',
-					"There's a pretty big chance, you've visited a website powered by Umbraco today",
+					"On an average day more than 1000 people download Umbraco",
+					"<a target='_blank' href='https://umbraco.tv/'>umbraco.tv</a> is the premier source of Umbraco video tutorials to get you started",
+					"You can find the world's friendliest CMS community at <a target='_blank' href='https://our.umbraco.com/'>our.umbraco.com</a>",
+					"You can become a certified Umbraco developer by attending one of the official courses",
+					"Umbraco works really well on tablets",
+					"You have 100% control over your markup and design when crafting a website in Umbraco",
+					"Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company",
+					"There's a pretty big chance you've visited a website powered by Umbraco today",
 					"'Umbraco-spotting' is the game of spotting big brands running Umbraco",
 					"At least 4 people have the Umbraco logo tattooed on them",
 					"'Umbraco' is the Danish name for an allen key",
@@ -101,6 +101,7 @@
@import "components/umb-confirm-action.less";
@import "components/umb-keyboard-shortcuts-overview.less";
@import "components/umb-checkbox-list.less";
+@import "components/umb-form-check.less";
@import "components/umb-locked-field.less";
@import "components/umb-tabs.less";
@import "components/umb-load-indicator.less";
@@ -28,7 +28,8 @@

 .umb-toggle__toggle {
    cursor: pointer;
-    display: inline-block;
+    align-items: center;
+    display: flex;
    width: 48px;
    height: 24px;
    background: @gray-8;
@@ -41,6 +42,11 @@
    background-color: @green;
 }

+.umb-toggle--disabled .umb-toggle__toggle {
+    cursor: not-allowed;
+    opacity: 0.8;
+}
+
 .umb-toggle--checked .umb-toggle__handler {
    transform: translate3d(24px, 0, 0) rotate(0);
 }
@@ -63,7 +69,7 @@

 .umb-toggle__icon {
    position: absolute;
-    top: 3px;
+    line-height: 1em;
    text-decoration: none;
    transition: all 0.2s ease;
 }
@@ -1,3 +1,6 @@
+@checkboxWidth: 15px;
+@checkboxHeight: 15px;
+
 .umb-checkbox-list {
  list-style: none;
  margin-left: 0;
@@ -0,0 +1,125 @@
+@checkboxWidth: 15px;
+@checkboxHeight: 15px;
+
+.umb-form-check {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    position: relative;
+    padding: 0;
+    margin: 0;
+
+    &__text{
+        margin: 0 0 0 26px;
+        position: relative;
+        top: 2px;
+    }
+
+    &__input{
+        position: absolute;
+        top: 0;
+        left: 0;
+        opacity: 0;
+
+        &:checked ~ .umb-form-check__state .umb-form-check__check{
+            border-color: @green;
+        }
+
+        &:focus:checked ~ .umb-form-check .umb-form-check__check,
+        &:focus ~ .umb-form-check__state .umb-form-check__check{
+            border-color: @gray-5;
+        }
+
+        &:checked ~ .umb-form-check__state{
+            .umb-form-check__check{
+                // This only happens if the state has a radiobutton modifier
+                .umb-form-check--radiobutton &{
+                    &:before{
+                        opacity: 1;
+                        transform: scale(1);
+                    }
+                }
+
+                // This only happens if state has the checkbox modifier
+                .umb-form-check--checkbox &{
+                    &:before{
+                        width: @checkboxWidth;
+                        height: @checkboxHeight;
+                    }
+                }
+            }
+
+            // This only happens if state has the checkbox modifier
+            .umb-form-check--checkbox &{
+                .umb-form-check__icon{
+                    opacity: 1;
+                }
+            }
+        }
+    }
+
+    &__state{
+        height: 17px;
+        position: absolute;
+        top: 2px;
+        left: 0;
+    }
+
+    &__check{
+        position: relative;
+        border: 1px solid @gray-7;
+        width: @checkboxWidth;
+        height: @checkboxHeight;
+
+        &:before{
+            content: "";
+            background: @green;
+            position: absolute;
+            left: 0;
+            right: 0;
+            top: 0;
+            bottom: 0;
+            margin: auto;
+        }
+
+        // This only happens if state has the radiobutton modifier
+        .umb-form-check--radiobutton &{
+            border-radius: 100%;
+
+            &:before{
+                width: 9px;
+                height: 9px;
+                border-radius: 100%;
+                opacity: 0;
+                transform: scale(0);
+                transition: .15s ease-out;
+            }
+        }
+
+        // This only happens if state has the checkbox modifier
+        .umb-form-check--checkbox &{
+            &:before{
+                width: 0;
+                height: 0;
+                transition: .05s ease-out;
+            }
+        }
+    }
+
+    &__icon{
+        color: @white;
+        text-align: center;
+        font-size: 10px;
+        opacity: 0;
+        transition: .2s ease-out;
+
+        &:before{
+            position: absolute;
+            top: -2px;
+            right: 0;
+            left: 0;
+            bottom: 0;
+            margin: auto;
+        }
+    }
+}
@@ -165,7 +165,7 @@ input.umb-table__input {

 }

-.-content :not(.with-unpublished-version).-unpublished {
+.-content .-unpublished:not(.with-unpublished-version) {
    .umb-table__name > * {
        opacity: .4;
    }
@@ -21,6 +21,12 @@
    cursor: pointer;
 }

+.umb-permission--disabled .umb-permission__toggle,
+.umb-permission--disabled .umb-permission__content {
+    cursor: not-allowed;
+    opacity: 0.8;
+}
+
 .umb-permission__description {
    font-size: 13px;
    color: @gray-5;
@@ -17,12 +17,14 @@
  -webkit-font-smoothing: antialiased;
  *margin-right: .3em;
 }
+
 [class^="icon-"]:before,
 [class*=" icon-"]:before {
  text-decoration: inherit;
  display: inline-block;
  speak: none;
 }
+
 /*
 [class^="icon-"]:before, [class*=" icon-"]:before {
 	font-family: 'icomoon';
@@ -38,7 +40,6 @@
 i.large{
 	font-size: 32px;
 }
-
 i.medium{
 	font-size: 24px;
 }
@@ -187,8 +188,6 @@ i.small{
 .icon-umb-translation:before, .traytranslation:before {
 	content: "\e1fd";
 }
-
-
 .icon-tv:before {
 	content: "\e02e";
 }
@@ -213,7 +212,8 @@ i.small{
 .icon-train:before {
 	content: "\e035";
 }
-.icon-trafic:before {
+.icon-trafic:before,
+.icon-traffic:before {
 	content: "\e036";
 }
 .icon-traffic-alt:before {
@@ -255,6 +255,7 @@ i.small{
 .icon-target:before {
 	content: "\e043";
 }
+.icon-temperature-alt:before,
 .icon-temperatrure-alt:before {
 	content: "\e044";
 }
@@ -267,6 +268,7 @@ i.small{
 .icon-theater:before {
 	content: "\e047";
 }
+.icon-thief:before,
 .icon-theif:before {
 	content: "\e048";
 }
@@ -375,6 +377,7 @@ i.small{
 .icon-shuffle:before {
 	content: "\e06b";
 }
+.icon-science:before,
 .icon-sience:before {
 	content: "\e06c";
 }
@@ -747,6 +750,7 @@ i.small{
 .icon-pictures-alt-2:before {
 	content: "\e0e7";
 }
+.icon-panel-close:before,
 .icon-pannel-close:before {
 	content: "\e0e8";
 }
@@ -1627,6 +1631,7 @@ i.small{
 .icon-alarm-clock:before {
 	content: "\e20c";
 }
+.icon-addressbook:before,
 .icon-adressbook:before {
 	content: "\e20d";
 }
@@ -1,3 +1,5 @@
+@checkered-background: url(../img/checkered-background.png);
+
 //
 // Container styles
 // --------------------------------------------------
@@ -11,7 +13,16 @@

 	&-push {
 		float:right;
-	}
+    }
+
+    &--list{
+        float: left;
+    }
+
+    &__item{
+        line-height: 1;
+        margin: 0 0 5px;
+    }
 }

 .umb-editor-tiny {
@@ -244,7 +255,7 @@ div.umb-codeeditor .umb-btn-toolbar {
        margin: 24px 0 0;
        display: flex;
    }
-    
+
    &__input {
        width: 100%;
        &-wrap{
@@ -386,7 +397,7 @@ div.umb-codeeditor .umb-btn-toolbar {
    max-height:100%;
    margin:auto;
    display:block;
-    background-image: url(../img/checkered-background.png);
+    background-image: @checkered-background;
 }

 .umb-sortable-thumbnails li .trashed {
@@ -599,12 +610,18 @@ div.umb-codeeditor .umb-btn-toolbar {
        vertical-align: top;
    }

-    .gravity-container .viewport {
-        max-width: 600px;
-    }
+    .gravity-container {
+        border: 1px solid @gray-8;
+        line-height: 0;

-    .gravity-container .viewport:hover {
-        cursor: pointer;
+        .viewport {
+            max-width: 600px;
+            background: @checkered-background;
+
+            &:hover {
+                cursor: pointer;
+            }
+        }
    }

    .imagecropper {
@@ -617,6 +634,10 @@ div.umb-codeeditor .umb-btn-toolbar {
            float: left;
            max-width: 100%;
        }
+
+        .viewport img {
+            background: @checkered-background;
+        }
    }

    .imagecropper .umb-cropper__container {
@@ -884,6 +905,10 @@ div.umb-codeeditor .umb-btn-toolbar {
  list-style: none;
  vertical-align: middle;
  margin-bottom: 0;
+
+  img {
+    background: @checkered-background;
+  }
 }

 .umb-fileupload label {
@@ -2,7 +2,7 @@
 	
 	<div class="umb-panel-body no-header with-footer umb-scrollable" ng-switch on="dialogMode">
 		<div class="umb-control-group">
-			<div ng-switch-when="list" ng-swicth-default class="tab-content form-horizontal umb-el-wrap">
+			<div ng-switch-when="list" ng-switch-default class="tab-content form-horizontal umb-el-wrap">
 					<ul class="nav nav-tabs nav-stacked">	
 						<li ng-repeat="macro in macros">
 							<a href="#" ng-click="configureMacro(macro)" prevent-default>
@@ -35,4 +35,4 @@
 	        </div>
 		</div>
 	</div>
-</div>
+</div>
@@ -9,6 +9,7 @@
                search-from-id="{{searchInfo.searchFromId}}"
                search-from-name="{{searchInfo.searchFromName}}"
                show-search="{{searchInfo.showSearch}}"
+                ignore-user-startnodes="{{searchInfo.ignoreUserStartNodes}}"
                section="content">
            </umb-tree-search-box>
        </div>
@@ -45,4 +46,4 @@
        on-close="closeMiniListView()">
    </umb-mini-list-view>

-</div>
+</div>
@@ -1,56 +1,58 @@
 //used for the media picker dialog
 angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
-	function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
-		var dialogOptions = $scope.model;
+    function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
+        var dialogOptions = $scope.model;

-		var searchText = "Search...";
-		localizationService.localize("general_search").then(function (value) {
-			searchText = value + "...";
-		});
+        var searchText = "Search...";
+        localizationService.localize("general_search").then(function (value) {
+            searchText = value + "...";
+        });

-		if (!$scope.model.title) {
-			$scope.model.title = localizationService.localize("defaultdialogs_selectLink");
-		}
+        if (!$scope.model.title) {
+            $scope.model.title = localizationService.localize("defaultdialogs_selectLink");
+        }

-		$scope.dialogTreeEventHandler = $({});
-		$scope.model.target = {};
-		$scope.searchInfo = {
-			searchFromId: null,
-			searchFromName: null,
-			showSearch: false,
-			results: [],
-			selectedSearchResults: []
-		};
+        $scope.dialogTreeEventHandler = $({});
+        $scope.model.target = {};
+        $scope.searchInfo = {
+            searchFromId: null,
+            searchFromName: null,
+            showSearch: false,
+            ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes,
+            results: [],
+            selectedSearchResults: []
+        };
+        $scope.customTreeParams = dialogOptions.ignoreUserStartNodes ? "ignoreUserStartNodes=" + dialogOptions.ignoreUserStartNodes : "";
+        $scope.showTarget = $scope.model.hideTarget !== true;

-		$scope.showTarget = $scope.model.hideTarget !== true;
+        if (dialogOptions.currentTarget) {
+            // clone the current target so we don't accidentally update the caller's model while manipulating $scope.model.target
+            $scope.model.target = angular.copy(dialogOptions.currentTarget);
+            //if we have a node ID, we fetch the current node to build the form data
+            if ($scope.model.target.id || $scope.model.target.udi) {

-		if (dialogOptions.currentTarget) {
-			$scope.model.target = dialogOptions.currentTarget;
-			//if we have a node ID, we fetch the current node to build the form data
-			if ($scope.model.target.id || $scope.model.target.udi) {
+                //will be either a udi or an int
+                var id = $scope.model.target.udi ? $scope.model.target.udi : $scope.model.target.id;

-				//will be either a udi or an int
-				var id = $scope.model.target.udi ? $scope.model.target.udi : $scope.model.target.id;
+                // is it a content link?
+                if (!$scope.model.target.isMedia) {
+                    // get the content path
+                    entityResource.getPath(id, "Document").then(function (path) {
+                        //now sync the tree to this path
+                        $scope.dialogTreeEventHandler.syncTree({
+                            path: path,
+                            tree: "content"
+                        });
+                    });

-				if (!$scope.model.target.path) {
-
-					entityResource.getPath(id, "Document").then(function (path) {
-						$scope.model.target.path = path;
-						//now sync the tree to this path
-						$scope.dialogTreeEventHandler.syncTree({
-							path: $scope.model.target.path,
-							tree: "content"
-						});
-					});
-				}
-
-				// if a link exists, get the properties to build the anchor name list
-				contentResource.getById(id).then(function (resp) {
-					$scope.model.target.url = resp.urls[0];
-					$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-				});
-			} else if ($scope.model.target.url.length) {
-			    // a url but no id/udi indicates an external link - trim the url to remove the anchor/qs
+                    // if a link exists, get the properties to build the anchor name list
+                    contentResource.getById(id, { ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes }).then(function (resp) {
+                        $scope.model.target.url = resp.urls[0];
+                        $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
+                    });
+                }
+            } else if ($scope.model.target.url.length) {
+                // a url but no id/udi indicates an external link - trim the url to remove the anchor/qs
                // only do the substring if there's a # or a ?
                var indexOfAnchor = $scope.model.target.url.search(/(#|\?)/);
                if (indexOfAnchor > -1) {
@@ -59,118 +61,132 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
                    // then rewrite the model and populate the link
                    $scope.model.target.url = $scope.model.target.url.substring(0, indexOfAnchor);
                }
-			}
-		} else if (dialogOptions.anchors) {
-			$scope.anchorValues = dialogOptions.anchors;
-		}
+            }
+        } else if (dialogOptions.anchors) {
+            $scope.anchorValues = dialogOptions.anchors;
+        }

-		function nodeSelectHandler(ev, args) {
-			if (args && args.event) {
-				args.event.preventDefault();
-				args.event.stopPropagation();
-			}
+        function nodeSelectHandler(ev, args) {
+            if (args && args.event) {
+                args.event.preventDefault();
+                args.event.stopPropagation();
+            }

-			eventsService.emit("dialogs.linkPicker.select", args);
+            eventsService.emit("dialogs.linkPicker.select", args);

-			if ($scope.currentNode) {
-				//un-select if there's a current one selected
-				$scope.currentNode.selected = false;
-			}
+            if ($scope.currentNode) {
+                //un-select if there's a current one selected
+                $scope.currentNode.selected = false;
+            }

-			$scope.currentNode = args.node;
-			$scope.currentNode.selected = true;
-			$scope.model.target.id = args.node.id;
-			$scope.model.target.udi = args.node.udi;
-			$scope.model.target.name = args.node.name;
+            $scope.currentNode = args.node;
+            $scope.currentNode.selected = true;
+            $scope.model.target.id = args.node.id;
+            $scope.model.target.udi = args.node.udi;
+            $scope.model.target.name = args.node.name;

-			if (args.node.id < 0) {
-				$scope.model.target.url = "/";
-			} else {
-				contentResource.getById(args.node.id).then(function (resp) {
-					$scope.model.target.url = resp.urls[0];
-					$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-				});
-			}
+            if (args.node.id < 0) {
+                $scope.model.target.url = "/";
+            } else {
+                contentResource.getById(args.node.id, { ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes }).then(function (resp) {
+                    $scope.model.target.url = resp.urls[0];
+                    $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
+                });
+            }

-			if (!angular.isUndefined($scope.model.target.isMedia)) {
-				delete $scope.model.target.isMedia;
-			}
-		}
+            if (!angular.isUndefined($scope.model.target.isMedia)) {
+                delete $scope.model.target.isMedia;
+            }
+        }

-		function nodeExpandedHandler(ev, args) {
-			// open mini list view for list views
-			if (args.node.metaData.isContainer) {
-				openMiniListView(args.node);
-			}
-		}
+        function nodeExpandedHandler(ev, args) {
+            // open mini list view for list views
+            if (args.node.metaData.isContainer) {
+                openMiniListView(args.node);
+            }
+        }

-		$scope.switchToMediaPicker = function () {
-			userService.getCurrentUser().then(function (userData) {
-				$scope.mediaPickerOverlay = {
-					view: "mediapicker",
-					startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
-					startNodeIsVirtual: userData.startMediaIds.length !== 1,
-					show: true,
-					submit: function (model) {
-						var media = model.selectedImages[0];
+        $scope.switchToMediaPicker = function () {
+            userService.getCurrentUser().then(function (userData) {
+                var startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                var startNodeIsVirtual = userData.startMediaIds.length !== 1;

-						$scope.model.target.id = media.id;
-						$scope.model.target.udi = media.udi;
-						$scope.model.target.isMedia = true;
-						$scope.model.target.name = media.name;
-						$scope.model.target.url = mediaHelper.resolveFile(media);
+                if (dialogOptions.ignoreUserStartNodes) {
+                    startNodeId = -1;
+                    startNodeIsVirtual = true;
+                }
+                $scope.mediaPickerOverlay = {
+                    view: "mediapicker",
+                    startNodeId: startNodeId,
+                    startNodeIsVirtual: startNodeIsVirtual,
+                    show: true,
+                    ignoreUserStartNodes: dialogOptions.ignoreUserStartNodes,
+                    submit: function (model) {
+                        var media = model.selectedImages[0];

-						$scope.mediaPickerOverlay.show = false;
-						$scope.mediaPickerOverlay = null;
-					}
-				};
-			});
-		};
+                        $scope.model.target.id = media.id;
+                        $scope.model.target.udi = media.udi;
+                        $scope.model.target.isMedia = true;
+                        $scope.model.target.name = media.name;
+                        $scope.model.target.url = mediaHelper.resolveFile(media);

-		$scope.hideSearch = function () {
-			$scope.searchInfo.showSearch = false;
-			$scope.searchInfo.searchFromId = null;
-			$scope.searchInfo.searchFromName = null;
-			$scope.searchInfo.results = [];
-		}
+                        $scope.mediaPickerOverlay.show = false;
+                        $scope.mediaPickerOverlay = null;

-		// method to select a search result
-		$scope.selectResult = function (evt, result) {
-			result.selected = result.selected === true ? false : true;
-			nodeSelectHandler(evt, {
-				event: evt,
-				node: result
-			});
-		};
+                        // make sure the content tree has nothing highlighted 
+                        $scope.dialogTreeEventHandler.syncTree({
+                            path: "-1",
+                            tree: "content"
+                        });
+                    }
+                };
+            });
+        };

-		//callback when there are search results
-		$scope.onSearchResults = function (results) {
-			$scope.searchInfo.results = results;
-			$scope.searchInfo.showSearch = true;
-		};
+        $scope.hideSearch = function () {
+            $scope.searchInfo.showSearch = false;
+            $scope.searchInfo.searchFromId = null;
+            $scope.searchInfo.searchFromName = null;
+            $scope.searchInfo.results = [];
+        }

-		$scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
-		$scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
+        // method to select a search result
+        $scope.selectResult = function (evt, result) {
+            result.selected = result.selected === true ? false : true;
+            nodeSelectHandler(evt, {
+                event: evt,
+                node: result
+            });
+        };

-		$scope.$on('$destroy', function () {
-			$scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
-			$scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
-		});
+        //callback when there are search results
+        $scope.onSearchResults = function (results) {
+            $scope.searchInfo.results = results;
+            $scope.searchInfo.showSearch = true;
+        };

-		// Mini list view
-		$scope.selectListViewNode = function (node) {
-			node.selected = node.selected === true ? false : true;
-			nodeSelectHandler({}, {
-				node: node
-			});
-		};
+        $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
+        $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);

-		$scope.closeMiniListView = function () {
-			$scope.miniListView = undefined;
-		};
+        $scope.$on('$destroy', function () {
+            $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
+            $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
+        });

-		function openMiniListView(node) {
-			$scope.miniListView = node;
-		}
+        // Mini list view
+        $scope.selectListViewNode = function (node) {
+            node.selected = node.selected === true ? false : true;
+            nodeSelectHandler({}, {
+                node: node
+            });
+        };

-	});
+        $scope.closeMiniListView = function () {
+            $scope.miniListView = undefined;
+        };
+
+        function openMiniListView(node) {
+            $scope.miniListView = node;
+        }
+
+    });
@@ -50,6 +50,7 @@
                                 search-from-id="{{searchInfo.searchFromId}}"
                                 search-from-name="{{searchInfo.searchFromName}}"
                                 show-search="{{searchInfo.showSearch}}"
+								 ignore-user-startnodes="{{searchInfo.ignoreUserStartNodes}}"
                                 section="{{section}}">
            </umb-tree-search-box>

@@ -64,6 +65,7 @@
                <umb-tree section="content"
                          hideheader="true"
                          hideoptions="true"
+						  customtreeparams="{{customTreeParams}}"
                          eventhandler="dialogTreeEventHandler"
                          enablelistviewexpand="true"
                          isdialog="true"
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
    .controller("Umbraco.Overlays.MediaPickerController",
-        function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService, $element, $timeout, $cookies, localStorageService, localizationService) {
+    function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService, $element, $timeout, userService, $cookies, localStorageService, localizationService) {

            if (!$scope.model.title) {
                $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
@@ -18,6 +18,8 @@ angular.module("umbraco")
            $scope.lastOpenedNode = localStorageService.get("umbLastOpenedMediaNodeId");
            $scope.lockedFolder = true;

+            var userStartNodes = []; 
+
            var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
            var allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
            if ($scope.onlyImages) {
@@ -47,7 +49,8 @@ angular.module("umbraco")
                pageSize: 100,
                totalItems: 0,
                totalPages: 0,
-                filter: ''
+                filter: '',
+                ignoreUserStartNodes: $scope.model.ignoreUserStartNodes
            };

            //preload selected item
@@ -57,15 +60,19 @@ angular.module("umbraco")
            }

            function onInit() {
-                if ($scope.startNodeId !== -1) {
-                    entityResource.getById($scope.startNodeId, "media")
-                        .then(function (ent) {
-                            $scope.startNodeId = ent.id;
-                            run();
-                        });
-                } else {
-                    run();
-                }
+                userService.getCurrentUser().then(function (userData) {
+                    userStartNodes = userData.startMediaIds;
+
+                    if ($scope.startNodeId !== -1) {
+                        entityResource.getById($scope.startNodeId, "media")
+                            .then(function (ent) {
+                                $scope.startNodeId = ent.id;
+                                run();
+                            });
+                    } else {
+                        run();
+                    }
+                });
            }

            function run() {
@@ -150,8 +157,8 @@ angular.module("umbraco")
                }

                if (folder.id > 0) {
-                    entityResource.getAncestors(folder.id, "media")
-                        .then(function(anc) {
+                    entityResource.getAncestors(folder.id, "media", { ignoreUserStartNodes: $scope.model.ignoreUserStartNodes })
+                        .then(function(anc) {              
                            $scope.path = _.filter(anc,
                                function(f) {
                                    return f.path.indexOf($scope.startNodeId) !== -1;
@@ -161,13 +168,13 @@ angular.module("umbraco")
                } else {
                    $scope.path = [];
                }
-
+              
                mediaTypeHelper.getAllowedImagetypes(folder.id)
                    .then(function (types) {
                        $scope.acceptedMediatypes = types;
                    });
-
-                $scope.lockedFolder = folder.id === -1 && $scope.model.startNodeIsVirtual;
+              
+                $scope.lockedFolder = (folder.id === -1 && $scope.model.startNodeIsVirtual) || hasFolderAccess(folder) === false;

                $scope.currentFolder = folder;
                localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
@@ -263,6 +270,17 @@ angular.module("umbraco")
                }
            }

+            function hasFolderAccess(node) {
+                var nodePath = node.path ? node.path.split(',') : [node.id];
+
+                for (var i = 0; i < nodePath.length; i++) {
+                    if (userStartNodes.indexOf(parseInt(nodePath[i])) !== -1)
+                        return true;
+                }
+                
+                return false;
+            }
+
            function gotoStartNode(err) {
                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
            }
@@ -297,7 +315,8 @@ angular.module("umbraco")
                                pageSize: 100,
                                totalItems: 0,
                                totalPages: 0,
-                                filter: ''
+                                filter: '',
+                                ignoreUserStartNodes: $scope.model.ignoreUserStartNodes
                            };
                            getChildren($scope.currentFolder.id);
                        }
@@ -369,7 +388,7 @@ angular.module("umbraco")

            function getChildren(id) {
                $scope.loading = true;
-                return mediaResource.getChildren(id)
+                return mediaResource.getChildren(id, { ignoreUserStartNodes: $scope.model.ignoreUserStartNodes })
                    .then(function(data) {
                        $scope.searchOptions.filter = "";
                        $scope.images = data.items ? data.items : [];
@@ -1,7 +0,0 @@
-<div>
-    <form ng-submit="model.submit(model)">
-        <umb-property property="property" ng-repeat="property in model.properties">
-            <umb-property-editor model="property"></umb-property-editor>
-        </umb-property>
-    </form>
-</div>
@@ -10,6 +10,7 @@
                search-from-id="{{searchInfo.searchFromId}}"
                search-from-name="{{searchInfo.searchFromName}}"
                show-search="{{searchInfo.showSearch}}"
+                ignore-user-startnodes="{{searchInfo.ignoreUserStartNodes}}"
                section="{{section}}">
            </umb-tree-search-box>
        </div>
--- a/Show More
+++ b/Show More